diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2016-10-09 17:49:20 +0200 |
|---|---|---|
| committer | Ulrich Sibiller <uli42@gmx.de> | 2016-10-10 22:58:33 +0200 |
| commit | b8de7bf654929c823080b211aeac56cd213f5a32 (patch) | |
| tree | b28abba7818115d2fed80eb360a79a0f9183948e | |
| parent | 01865335b4a10e01441d7cc454bdcfbaa71aef51 (diff) | |
| download | nx-libs-b8de7bf654929c823080b211aeac56cd213f5a32.tar.gz nx-libs-b8de7bf654929c823080b211aeac56cd213f5a32.tar.bz2 nx-libs-b8de7bf654929c823080b211aeac56cd213f5a32.zip | |
Use both __APPLE__ and __DARWIN__ defines
Imake unsets __APPLE__ and sets __DARWIN__ instead while autoconf seems to use
__APPLE__ and not __DARWIN__ anymore.
This way we should stay safe for now. Can be changed to __APPLE__ when
we switch to modular.
| -rw-r--r-- | nx-X11/extras/Mesa/src/glx/x11/indirect_size.c | 2 | ||||
| -rw-r--r-- | nx-X11/include/Xos_r.h | 6 | ||||
| -rw-r--r-- | nx-X11/lib/X11/SetLocale.c | 4 | ||||
| -rw-r--r-- | nx-X11/lib/X11/XlcPubI.h | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/nx-X11/extras/Mesa/src/glx/x11/indirect_size.c b/nx-X11/extras/Mesa/src/glx/x11/indirect_size.c index 1fce2f5ca..470a075c9 100644 --- a/nx-X11/extras/Mesa/src/glx/x11/indirect_size.c +++ b/nx-X11/extras/Mesa/src/glx/x11/indirect_size.c @@ -55,7 +55,7 @@ # define INTERNAL # endif -#if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__APPLE__) +#if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__APPLE__) || defined(__DARWIN__) # undef HAVE_ALIAS #endif #ifdef HAVE_ALIAS 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__) diff --git a/nx-X11/lib/X11/SetLocale.c b/nx-X11/lib/X11/SetLocale.c index 6936cbf87..cf068403b 100644 --- a/nx-X11/lib/X11/SetLocale.c +++ b/nx-X11/lib/X11/SetLocale.c @@ -118,7 +118,7 @@ _Xsetlocale( #else /* X_LOCALE */ -#if defined(__APPLE__) || defined(__CYGWIN__) +#if defined(__DARWIN__) || defined(__APPLE__) || defined(__CYGWIN__) char * _Xsetlocale( int category, @@ -127,7 +127,7 @@ _Xsetlocale( { return setlocale(category, name); } -#endif /* __APPLE__ || __CYGWIN__ */ +#endif /* __DARWIN__ || __APPLE__ || __CYGWIN__ */ /* * _XlcMapOSLocaleName is an implementation dependent routine that derives diff --git a/nx-X11/lib/X11/XlcPubI.h b/nx-X11/lib/X11/XlcPubI.h index 22ac2bdf0..f41e3442a 100644 --- a/nx-X11/lib/X11/XlcPubI.h +++ b/nx-X11/lib/X11/XlcPubI.h @@ -238,7 +238,7 @@ _Xsetlocale( int category, _Xconst char *name); #else -#ifdef __APPLE__ +#if defined(__APPLE__) || defined(__DARWIN__) extern char * _Xsetlocale( int category, |