aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/lib/X11
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2016-10-09 17:49:20 +0200
committerUlrich Sibiller <uli42@gmx.de>2016-10-10 22:58:33 +0200
commitb8de7bf654929c823080b211aeac56cd213f5a32 (patch)
treeb28abba7818115d2fed80eb360a79a0f9183948e /nx-X11/lib/X11
parent01865335b4a10e01441d7cc454bdcfbaa71aef51 (diff)
downloadnx-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.
Diffstat (limited to 'nx-X11/lib/X11')
-rw-r--r--nx-X11/lib/X11/SetLocale.c4
-rw-r--r--nx-X11/lib/X11/XlcPubI.h2
2 files changed, 3 insertions, 3 deletions
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,