summaryrefslogtreecommitdiffstats
path: root/nsprpub/pr/tests/socket.c
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-04-25 21:33:57 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-04-25 21:33:57 +0200
commit7c4d50dccf3080965c202f63aa56439e3824eaf3 (patch)
tree59026bd0f554a24878db82841a508c8fa7ca8356 /nsprpub/pr/tests/socket.c
parentfba28f19754f62b5227650143d5441fc86d4c7d7 (diff)
downloadUXP-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/tests/socket.c')
-rw-r--r--nsprpub/pr/tests/socket.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/nsprpub/pr/tests/socket.c b/nsprpub/pr/tests/socket.c
index 92f019d01..5ee2b78f3 100644
--- a/nsprpub/pr/tests/socket.c
+++ b/nsprpub/pr/tests/socket.c
@@ -21,7 +21,7 @@
#ifdef XP_UNIX
#include <sys/mman.h>
#endif
-#if defined(_PR_PTHREADS)
+#if defined(_PR_PTHREADS) && !defined(_PR_DCETHREADS)
#include <pthread.h>
#endif
@@ -313,7 +313,7 @@ PRThread* create_new_thread(PRThreadType type,
PRInt32 native_thread = 0;
PR_ASSERT(state == PR_UNJOINABLE_THREAD);
-#if defined(_PR_PTHREADS) || defined(WIN32)
+#if (defined(_PR_PTHREADS) && !defined(_PR_DCETHREADS)) || defined(WIN32)
switch(index % 4) {
case 0:
scope = (PR_LOCAL_THREAD);
@@ -332,7 +332,7 @@ PRInt32 native_thread = 0;
break;
}
if (native_thread) {
-#if defined(_PR_PTHREADS)
+#if defined(_PR_PTHREADS) && !defined(_PR_DCETHREADS)
pthread_t tid;
if (!pthread_create(&tid, NULL, (void * (*)(void *)) start, arg))
return((PRThread *) tid);