Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Unified Diff: mozilla/nsprpub/pr/src/pthreads/ptio.c

Issue 12089033: Update to NSPR 4.9.5 Beta 2, part 2: actual changes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/nss/
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mozilla/nsprpub/pr/src/misc/prtime.c ('k') | mozilla/nsprpub/pr/src/pthreads/ptthread.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mozilla/nsprpub/pr/src/pthreads/ptio.c
===================================================================
--- mozilla/nsprpub/pr/src/pthreads/ptio.c (revision 179237)
+++ mozilla/nsprpub/pr/src/pthreads/ptio.c (working copy)
@@ -1150,7 +1150,7 @@
osfd = socket(AF_INET6, SOCK_STREAM, 0);
if (osfd != -1) {
int on;
- int optlen = sizeof(on);
+ socklen_t optlen = sizeof(on);
if (getsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY,
&on, &optlen) == 0) {
_pr_ipv6_v6only_on_by_default = on;
@@ -4850,7 +4850,7 @@
#include <sys/types.h>
#include <sys/time.h>
-#if !defined(SUNOS4) && !defined(HPUX) \
+#if !defined(HPUX) \
&& !defined(LINUX) && !defined(__GNU__) && !defined(__GLIBC__)
#include <sys/select.h>
#endif
« no previous file with comments | « mozilla/nsprpub/pr/src/misc/prtime.c ('k') | mozilla/nsprpub/pr/src/pthreads/ptthread.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698