diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-04-25 23:08:37 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-04-25 23:08:37 +0200 |
| commit | 42f8488a5f66d7c1e5324bd1755d7f693b16ee97 (patch) | |
| tree | 54c7d2a62c4ea34b1250b5362c8e6f89d03f1a02 /nsprpub/pr/tests/thrpool_server.c | |
| parent | 681c39a0ecc84fc918b2bec72cc69ad27d39903a (diff) | |
| parent | 6c3f95480a191ce432ddfb2aa400a6d70c4884a8 (diff) | |
| download | uxp-42f8488a5f66d7c1e5324bd1755d7f693b16ee97.tar.gz | |
Merge branch 'master' into Basilisk-releasev2018.04.26
Diffstat (limited to 'nsprpub/pr/tests/thrpool_server.c')
| -rw-r--r-- | nsprpub/pr/tests/thrpool_server.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nsprpub/pr/tests/thrpool_server.c b/nsprpub/pr/tests/thrpool_server.c index ef09f23b51..9665829a1a 100644 --- a/nsprpub/pr/tests/thrpool_server.c +++ b/nsprpub/pr/tests/thrpool_server.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 |