Update NSPR to NSPR_4_9_BETA3. Fixes bug 684254, bug 331316, bug 684758, bug 681558

This commit is contained in:
Ehsan Akhgari 2011-09-29 18:42:53 -04:00
parent 9e431fb574
commit 88d00459a7
6 changed files with 12 additions and 2 deletions

View File

@ -1 +1 @@
NSPR_4_9_BETA2
NSPR_4_9_BETA3

View File

@ -43,3 +43,4 @@
#error "Do not include this header file."

View File

@ -106,6 +106,11 @@ struct sockaddr_dl;
#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)
/*

View File

@ -1635,7 +1635,8 @@ static PRStatus pt_ConnectContinue(
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);

View File

@ -212,6 +212,8 @@ int main(int argc, char **argv)
CreateThreadsUU();
CreateThreadsKU();
PR_Cleanup();
return 0;
}
#endif /* XP_BEOS */

View File

@ -404,6 +404,7 @@ int main(int argc, char **argv)
if (NULL == server_name) Server();
else Client(server_name);
return 0;
} /* main */
/* thruput.c */