Commit 88d00459 authored by Ehsan Akhgari's avatar Ehsan Akhgari
Browse files

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

parent 9e431fb5
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
NSPR_4_9_BETA2
NSPR_4_9_BETA3
+1 −0
Original line number Diff line number Diff line
@@ -43,3 +43,4 @@

#error "Do not include this header file."

+5 −0
Original line number Diff line number Diff line
@@ -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)

/*
+2 −1
Original line number Diff line number Diff line
@@ -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);
+2 −0
Original line number Diff line number Diff line
@@ -212,6 +212,8 @@ int main(int argc, char **argv)
    CreateThreadsUU();
    CreateThreadsKU();
    PR_Cleanup();

    return 0;
}

#endif /* XP_BEOS */
Loading