Update NSPR to NSPR_4_9_BETA3. Fixes bug 684254, bug 331316, bug 684758, bug 681558
authorEhsan Akhgari <ehsan@mozilla.com>
Thu, 29 Sep 2011 18:42:53 -0400
changeset 77868 7e25caedd6201db0587b1ce92c75b3ec2dabc8cf
parent 77867 6ced8d07826c4b8da0e53f2c2346ac8127a4f7d8
child 77869 dbb129f069b1afeefdfa85c113b4b7777c3a992e
push id21246
push usereakhgari@mozilla.com
push dateThu, 29 Sep 2011 22:45:41 +0000
treeherdermozilla-central@7e25caedd620 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs684254, 331316, 684758, 681558
milestone10.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Update NSPR to NSPR_4_9_BETA3. Fixes bug 684254, bug 331316, bug 684758, bug 681558
nsprpub/TAG-INFO
nsprpub/config/prdepend.h
nsprpub/pr/include/prinet.h
nsprpub/pr/src/pthreads/ptio.c
nsprpub/pr/tests/suspend.c
nsprpub/pr/tests/thruput.c
--- a/nsprpub/TAG-INFO
+++ b/nsprpub/TAG-INFO
@@ -1,1 +1,1 @@
-NSPR_4_9_BETA2
+NSPR_4_9_BETA3
--- a/nsprpub/config/prdepend.h
+++ b/nsprpub/config/prdepend.h
@@ -38,8 +38,9 @@
 /*
  * A dummy header file that is a dependency for all the object files.
  * Used to force a full recompilation of NSPR in Mozilla's Tinderbox
  * depend builds.  See comments in rules.mk.
  */
 
 #error "Do not include this header file."
 
+
--- a/nsprpub/pr/include/prinet.h
+++ b/nsprpub/pr/include/prinet.h
@@ -101,16 +101,21 @@ struct sockaddr_dl;
 /*
  * Prototypes of ntohl() etc. are declared in <machine/endian.h>
  * on these platforms.
  */
 #if defined(BSDI) || defined(OSF1)
 #include <machine/endian.h>
 #endif
 
+/* On Android, ntohl() etc. are declared in <sys/endian.h>. */
+#ifdef __ANDROID__
+#include <sys/endian.h>
+#endif
+
 #elif defined(WIN32)
 
 /*
  * Do not include any system header files.
  *
  * Originally we were including <windows.h>.  It slowed down the
  * compilation of files that included NSPR headers, so we removed
  * the <windows.h> inclusion at customer's request, which created
--- a/nsprpub/pr/src/pthreads/ptio.c
+++ b/nsprpub/pr/src/pthreads/ptio.c
@@ -1630,17 +1630,18 @@ static PRStatus pt_ConnectContinue(
     int err;
     PRInt32 osfd;
 
     if (out_flags & PR_POLL_NVAL)
     {
         PR_SetError(PR_BAD_DESCRIPTOR_ERROR, 0);
         return PR_FAILURE;
     }
-    if ((out_flags & (PR_POLL_WRITE | PR_POLL_EXCEPT | PR_POLL_ERR)) == 0)
+    if ((out_flags & (PR_POLL_WRITE | PR_POLL_EXCEPT | PR_POLL_ERR
+        | PR_POLL_HUP)) == 0)
     {
         PR_ASSERT(out_flags == 0);
         PR_SetError(PR_IN_PROGRESS_ERROR, 0);
         return PR_FAILURE;
     }
 
     osfd = fd->secret->md.osfd;
 
--- a/nsprpub/pr/tests/suspend.c
+++ b/nsprpub/pr/tests/suspend.c
@@ -207,11 +207,13 @@ int main(int argc, char **argv)
 
     printf("\n%20s%30s\n\n"," ","Added 2nd CPU\n");
 
     CreateThreadsUK();
     CreateThreadsKK();
     CreateThreadsUU();
     CreateThreadsKU();
     PR_Cleanup();
+
+    return 0;
 }
 
 #endif /* XP_BEOS */
--- a/nsprpub/pr/tests/thruput.c
+++ b/nsprpub/pr/tests/thruput.c
@@ -399,12 +399,13 @@ int main(int argc, char **argv)
     if (-1 != xport_buffer)
     PR_fprintf(
         err, "Transport send & receive buffer size will be %u\n", xport_buffer);
     
 
     if (NULL == server_name) Server();
     else Client(server_name);
 
+    return 0;
 }  /* main */
 
 /* thruput.c */