diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-02-23 11:03:38 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-06-05 22:23:36 +0200 |
| commit | 75b3dd4cbffb6e4534128278300ed6c8a3ab7506 (patch) | |
| tree | c09fcfbd7a6a3aa67c970934c09b087e7950d83f /nsprpub/pr/include/private | |
| parent | a421f38160599152cd409e4fabd434a224f78487 (diff) | |
| download | UXP-75b3dd4cbffb6e4534128278300ed6c8a3ab7506.tar UXP-75b3dd4cbffb6e4534128278300ed6c8a3ab7506.tar.gz UXP-75b3dd4cbffb6e4534128278300ed6c8a3ab7506.tar.lz UXP-75b3dd4cbffb6e4534128278300ed6c8a3ab7506.tar.xz UXP-75b3dd4cbffb6e4534128278300ed6c8a3ab7506.zip | |
Update NSPR to 4.18
Diffstat (limited to 'nsprpub/pr/include/private')
| -rw-r--r-- | nsprpub/pr/include/private/primpl.h | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/nsprpub/pr/include/private/primpl.h b/nsprpub/pr/include/private/primpl.h index dc24a2572..a817c206c 100644 --- a/nsprpub/pr/include/private/primpl.h +++ b/nsprpub/pr/include/private/primpl.h @@ -6,14 +6,6 @@ #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 @@ -1877,7 +1869,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) && !defined(_PR_DCETHREADS) +#if defined(_PR_PTHREADS) #define _PR_ZONE_ALLOCATOR #endif @@ -2165,6 +2157,18 @@ 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___ */ |