Revert "Update NSPR to 4.18"

This reverts commit 8781f745556be5d7402d0f3adc67ecfe32fe04a0.
This commit is contained in:
wolfbeast 2018-04-25 21:33:57 +02:00 committed by Roy Tam
commit cd3167e35d
32 changed files with 395 additions and 295 deletions

View file

@ -6,6 +6,14 @@
#ifndef primpl_h___
#define primpl_h___
/*
* HP-UX 10.10's pthread.h (DCE threads) includes dce/cma.h, which
* has:
* #define sigaction _sigaction_sys
* This macro causes chaos if signal.h gets included before pthread.h.
* To be safe, we include pthread.h first.
*/
#if defined(_PR_PTHREADS)
#include <pthread.h>
#endif
@ -1869,7 +1877,7 @@ extern PRFileDesc *_pr_stderr;
** and functions with macros that expand to the native thread
** types and functions on each platform.
*/
#if defined(_PR_PTHREADS)
#if defined(_PR_PTHREADS) && !defined(_PR_DCETHREADS)
#define _PR_ZONE_ALLOCATOR
#endif
@ -2157,18 +2165,6 @@ extern PRUint32 connectCount;
#endif /* XP_BEOS */
#if defined(_WIN64) && defined(WIN95)
typedef struct _PRFileDescList {
PRFileDesc *fd;
struct _PRFileDescList *next;
} PRFileDescList;
extern PRLock *_fd_waiting_for_overlapped_done_lock;
extern PRFileDescList *_fd_waiting_for_overlapped_done;
extern void CheckOverlappedPendingSocketsAreDone();
#endif
PR_END_EXTERN_C
#endif /* primpl_h___ */