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.

Use both APPLE and DARWIN defines
b8de7bf6 · Ulrich Sibiller · 01865335 · b8de7bf6 · b8de7bf6 · b8de7bf6
Commit b8de7bf6 authored Oct 09, 2016 by Ulrich Sibiller
Showing with 7 additions and 7 deletions

indirect_size.c nx-X11/extras/Mesa/src/glx/x11/indirect_size.c +1 -1

Xos_r.h nx-X11/include/Xos_r.h +3 -3

SetLocale.c nx-X11/lib/X11/SetLocale.c +2 -2

XlcPubI.h nx-X11/lib/X11/XlcPubI.h +1 -1

No files found.
--- 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

--- 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__)

--- 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

--- 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,