diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-04-25 21:33:57 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-04-25 21:33:57 +0200 |
| commit | 7c4d50dccf3080965c202f63aa56439e3824eaf3 (patch) | |
| tree | 59026bd0f554a24878db82841a508c8fa7ca8356 /nsprpub/pr/include/private | |
| parent | fba28f19754f62b5227650143d5441fc86d4c7d7 (diff) | |
| download | UXP-7c4d50dccf3080965c202f63aa56439e3824eaf3.tar UXP-7c4d50dccf3080965c202f63aa56439e3824eaf3.tar.gz UXP-7c4d50dccf3080965c202f63aa56439e3824eaf3.tar.lz UXP-7c4d50dccf3080965c202f63aa56439e3824eaf3.tar.xz UXP-7c4d50dccf3080965c202f63aa56439e3824eaf3.zip | |
Revert "Update NSPR to 4.18"
This reverts commit 8781f745556be5d7402d0f3adc67ecfe32fe04a0.
Diffstat (limited to 'nsprpub/pr/include/private')
| -rw-r--r-- | nsprpub/pr/include/private/primpl.h | 22 |
1 files changed, 9 insertions, 13 deletions
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 <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___ */ |