Remove defined(__WXMAC__) && defined(__APPLE__) case from the OS if/elif block.

It would never have been used in a configure build since setup.h which defines
__UNIX__ is included from platform.h before the if/elif block.  Likewise, it
would not have been used for wxMac Xcode builds since they use config_xcode.h
which also defines __UNIX__.  That's fortunate since __POWERPC__ was defined
unconditionally in that case.  Note that classic builds wouldn't have used
the case either since they have their own case just before it (which remains).

Add __MACH__ to the list of UNIX defines (e.g. like __hpux) so that the UNIX
case of the OS if/elif block is guaranteed to match for all Mach systems.  In
addition to that, within that case check for __APPLE__ && __MACH__ and make
sure that __BSD__ and __DARWIN__ are defined, TARGET_CARBON is defined,
and wxSIZE_T_IS_ULONG is defined.

Add __ppc__ to the list of defines that will cause __POWERPC__ to be defined
although it's interesting to note that we don't seem to use it anywhere.

Make sure that each case of the OS if/elif block has a /* OS ... */ comment
to make the code a bit easier to follow.

Remove comment about __DARWIN__ being used to work around defects in GCC,
that was removed years ago.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 5d1c1d1a2e3955d0783934a1a717ccc16f6f86ad..7d32b43345b0bd99adc95830b176c43eec4ae764 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -212,7 +212,7 @@
     #endif
 #endif /* ia64 */
 
-#if defined(_M_MPPC) || defined(__PPC__)
+#if defined(_M_MPPC) || defined(__PPC__) || defined(__ppc__)
     #ifndef __POWERPC__
         #define __POWERPC__
     #endif
@@ -302,11 +302,12 @@
 /*
    OS: then test for generic Unix defines, then for particular flavours and
        finally for Unix-like systems
+       Mac OS X matches this case (__MACH__), prior Mac OS do not.
  */
 #elif defined(__UNIX__) || defined(__unix) || defined(__unix__) || \
       defined(____SVR4____) || defined(__LINUX__) || defined(__sgi) || \
       defined(__hpux) || defined(sun) || defined(__SUN__) || defined(_AIX) || \
-      defined(__EMX__) || defined(__VMS) || defined(__BEOS__)
+      defined(__EMX__) || defined(__VMS) || defined(__BEOS__) || defined(__MACH__)
 
 #    define __UNIX_LIKE__
 
@@ -348,6 +349,35 @@
 #            define wxSIZE_T_IS_UINT
 #        endif
 #    endif
+
+    /*  All of these should already be defined by including configure-
+        generated setup.h but we wish to support Xcode compilation without
+        requiring the user to define these himself.
+     */
+#    if defined(__APPLE__) && defined(__MACH__)
+#        ifndef __UNIX__
+#            define __UNIX__ 1
+#        endif
+#        ifndef __BSD__
+#            define __BSD__ 1
+#        endif
+        /*  __DARWIN__ is our own define to mean OS X or pure Darwin */
+#        ifndef __DARWIN__
+#            define __DARWIN__ 1
+#        endif
+        /*  NOTE: TARGET_CARBON is actually a 0/1 and must be 1 for OS X */
+#        ifndef TARGET_CARBON
+#            define TARGET_CARBON 1
+#        endif
+        /* OS X uses unsigned long size_t for both ILP32 and LP64 modes. */
+#        if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG)
+#            define wxSIZE_T_IS_ULONG
+#        endif
+#    endif
+
+/*
+   OS: Classic Mac OS
+ */
 #elif defined(applec) || \
       defined(THINK_C) || \
       (defined(__MWERKS__) && !defined(__INTEL__))
@@ -355,38 +385,10 @@
 #    if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG)
 #        define wxSIZE_T_IS_ULONG
 #    endif
-#elif defined(__WXMAC__) && defined(__APPLE__)
-    /* Mac OS X */
-#    define __UNIX_LIKE__
 
-    /*
-      These defines are needed when compiling using Project Builder
-      with a non generated setup0.h
-    */
-#    ifndef __UNIX__
-#        define __UNIX__ 1
-#    endif
-#    ifndef __BSD__
-#        define __BSD__ 1
-#    endif
-#    ifndef __DARWIN__
-#        define __DARWIN__ 1
-#    endif
-#    ifndef __POWERPC__
-#        define __POWERPC__ 1
-#    endif
-#    ifndef TARGET_CARBON
-#        define TARGET_CARBON 1
-#    endif
-
-#    if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG)
-#        define wxSIZE_T_IS_ULONG
-#    endif
-    /*
-       Some code has been added to workaround defects(?) in the
-       bundled gcc compiler. These corrections are identified by
-       __DARWIN__ for Darwin related corrections (wxMac, wxMotif)
-     */
+/*
+   OS: OS/2
+ */
 #elif defined(__OS2__)
 
     /* wxOS2 vs. non wxOS2 ports on OS2 platform */
@@ -407,6 +409,9 @@
 #    endif
 #    define wxSIZE_T_IS_UINT
 
+/*
+   OS: Palm OS
+ */
 #elif defined(__PALMOS__)
 #    ifdef __WIN32__
 #        error "__WIN32__ should not be defined for PalmOS"
@@ -418,6 +423,9 @@
 #        error "__WXMSW__ should not be defined for PalmOS"
 #    endif
 
+/*
+   OS: Otherwise it must be Windows
+ */
 #else   /* Windows */
 #    ifndef __WINDOWS__
 #        define __WINDOWS__