From 7c4d50dccf3080965c202f63aa56439e3824eaf3 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Wed, 25 Apr 2018 21:33:57 +0200 Subject: Revert "Update NSPR to 4.18" This reverts commit 8781f745556be5d7402d0f3adc67ecfe32fe04a0. --- nsprpub/pr/include/private/primpl.h | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'nsprpub/pr/include/private') diff --git a/nsprpub/pr/include/private/primpl.h b/nsprpub/pr/include/private/primpl.h index a817c206c..dc24a2572 100644 --- a/nsprpub/pr/include/private/primpl.h +++ b/nsprpub/pr/include/private/primpl.h @@ -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 #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___ */ -- cgit v1.2.3