Differential D28871 Diff 84858 emulators/virtualbox-ose/files/patch-src_libs_xpcom18a4_nsprpub_pr_src_pthreads_ptsynch.c
Changeset View
Changeset View
Standalone View
Standalone View
emulators/virtualbox-ose/files/patch-src_libs_xpcom18a4_nsprpub_pr_src_pthreads_ptsynch.c
| --- src/libs/xpcom18a4/nsprpub/pr/src/pthreads/ptsynch.c.orig 2020-05-13 19:46:23 UTC | --- src/libs/xpcom18a4/nsprpub/pr/src/pthreads/ptsynch.c.orig 2019-04-16 10:18:41 UTC | ||||
| +++ src/libs/xpcom18a4/nsprpub/pr/src/pthreads/ptsynch.c | +++ src/libs/xpcom18a4/nsprpub/pr/src/pthreads/ptsynch.c | ||||
| @@ -49,6 +49,9 @@ | @@ -49,6 +49,9 @@ | ||||
| #include <string.h> | #include <string.h> | ||||
| #include <pthread.h> | #include <pthread.h> | ||||
| #include <sys/time.h> | #include <sys/time.h> | ||||
| +#ifdef FREEBSD | +#ifdef FREEBSD | ||||
| +#include <sys/param.h> | +#include <sys/param.h> | ||||
| +#endif | +#endif | ||||
| static pthread_mutexattr_t _pt_mattr; | static pthread_mutexattr_t _pt_mattr; | ||||
| static pthread_condattr_t _pt_cvar_attr; | static pthread_condattr_t _pt_cvar_attr; | ||||
| @@ -798,7 +801,8 @@ PR_IMPLEMENT(PRStatus) PR_DeleteSemaphore(const char * | @@ -798,6 +801,7 @@ PR_IMPLEMENT(PRStatus) PR_DeleteSemaphore(const char * | ||||
| * From the semctl(2) man page in glibc 2.0 | * From the semctl(2) man page in glibc 2.0 | ||||
| */ | */ | ||||
| #if (defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)) \ | #if (defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)) \ | ||||
| - || defined(FREEBSD) || defined(OPENBSD) || defined(BSDI) | |||||
| + || (defined(FREEBSD) && __FreeBSD_version < 1200059) \ | + || (defined(FREEBSD) && __FreeBSD_version < 1200059) \ | ||||
| + || defined(OPENBSD) || defined(BSDI) | || defined(OPENBSD) || defined(BSDI) | ||||
| /* union semun is defined by including <sys/sem.h> */ | /* union semun is defined by including <sys/sem.h> */ | ||||
| #else | #else | ||||
| /* according to X/OPEN we have to define it ourselves */ | |||||