From b8de7bf654929c823080b211aeac56cd213f5a32 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sun, 9 Oct 2016 17:49:20 +0200 Subject: 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. --- nx-X11/lib/X11/SetLocale.c | 4 ++-- nx-X11/lib/X11/XlcPubI.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'nx-X11/lib/X11') 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, -- cgit v1.2.3