diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-12 08:32:04 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-12 08:32:04 +0200 |
| commit | 051d521f6e20761ba6831cecd91883da960fa931 (patch) | |
| tree | b28abba7818115d2fed80eb360a79a0f9183948e /nx-X11/include/Xos_r.h | |
| parent | 6dce607bad8711dd06a5a7b69ad1930386b4123b (diff) | |
| parent | b8de7bf654929c823080b211aeac56cd213f5a32 (diff) | |
| download | nx-libs-051d521f6e20761ba6831cecd91883da960fa931.tar.gz nx-libs-051d521f6e20761ba6831cecd91883da960fa931.tar.bz2 nx-libs-051d521f6e20761ba6831cecd91883da960fa931.zip | |
Merge branch 'uli42-pr/upgrade_libX11' into 3.6.x
Attributes GH PR #214: https://github.com/ArcticaProject/nx-libs/pull/214
Fixes ArcticaProject/nx-libs#157.
Diffstat (limited to 'nx-X11/include/Xos_r.h')
| -rw-r--r-- | nx-X11/include/Xos_r.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nx-X11/include/Xos_r.h b/nx-X11/include/Xos_r.h index 4147a4473..bafbefcb3 100644 --- a/nx-X11/include/Xos_r.h +++ b/nx-X11/include/Xos_r.h @@ -257,7 +257,7 @@ typedef struct { */ #if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || \ - defined(__APPLE__) || defined(__DragonFly__) + defined(__APPLE__) || defined(__DARWIN__) || defined(__DragonFly__) static __inline__ void _Xpw_copyPasswd(_Xgetpwparams p) { memcpy(&(p).pws, (p).pwp, sizeof(struct passwd)); @@ -327,7 +327,7 @@ static __inline__ void _Xpw_copyPasswd(_Xgetpwparams p) (_Xos_processUnlock), \ (p).pwp ) -#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(__APPLE__) +#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(__APPLE__) && !defined(__DARWIN__) /* SVR4 threads, AIX 4.2.0 and earlier and OSF/1 3.2 and earlier pthreads */ # define X_NEEDS_PWPARAMS typedef struct { @@ -620,7 +620,7 @@ typedef struct { } _Xreaddirparams; # if defined(_POSIX_THREAD_SAFE_FUNCTIONS) || defined(AIXV3) || \ - defined(AIXV4) || defined(__APPLE__) + defined(AIXV4) || defined(__APPLE__) || defined(__DARWIN__) /* AIX defines the draft POSIX symbol, but uses the final API. */ /* POSIX final API, returns (int)0 on success. */ # if defined(__osf__) |