check that the version of __sync_sub_and_fetch that returns a value is supported...

[wxWidgets.git] / include / wx / platform.h

diff --git a/include/wx/platform.h b/include/wx/platform.h
index b11bad042a1d0abd035a2723fe8bb217b9ec9da1..fce5c927cd5f83ef7c15282e8775305a461c7fc7 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -32,7 +32,7 @@
 #ifdef __WXMAC__
 #    if defined(__MACH__)
 #        define __WXMAC_OSX__
-#        define __WXMAC_CARBON__
+#        define __WXMAC_CARBON__ /* for backwards compat in user code still defined */
 #        include <AvailabilityMacros.h>
 #        ifndef MAC_OS_X_VERSION_10_4
 #           define MAC_OS_X_VERSION_10_4 1040
@@ -40,26 +40,40 @@
 #        ifndef MAC_OS_X_VERSION_10_5
 #           define MAC_OS_X_VERSION_10_5 1050
 #        endif
-#        ifdef __WXMAC_XCODE__
-#            include <unistd.h>
-#            include "wx/mac/carbon/config_xcode.h"
-#        endif
 #    else
-#        if TARGET_CARBON
-#            define __WXMAC_CARBON__
-#        else
-#            define __WXMAC_CLASSIC__
-#        endif
+#        error "only mach-o configurations are supported"
 #    endif
 #endif
 
 /*
     __WXOSX__ is a common define to wxMac (Carbon) and wxCocoa ports under OS X.
+
+    DO NOT use this define in base library code.  Although wxMac has its own
+    private base library (and thus __WXOSX__,__WXMAC__ and related defines are
+    valid there), wxCocoa shares its library with other ports like wxGTK and wxX11.
+
+    To keep wx authors from screwing this up, only enable __WXOSX__ for wxCocoa when
+    not compiling the base library.  We determine this by first checking if
+    wxUSE_BASE is not defined.  If it is not defined, then we're not buildling
+    the base library, and possibly not building wx at all (but actually building
+    user code that's using wx). If it is defined then we must check to make sure
+    it is not true.  If it is true, we're building base.
+
+    If you want it in the common darwin base library then use __DARWIN__.  You
+    can use any Darwin-available libraries like CoreFoundation but please avoid
+    using OS X libraries like Carbon or CoreServices.
+
  */
-#if defined(__WXMAC_OSX__) || defined(__WXCOCOA__)
+#if defined(__WXMAC_OSX__) || (defined(__WXCOCOA__) && (!defined(wxUSE_BASE) || !wxUSE_BASE))
 #   define __WXOSX__
 #endif
 
+#ifdef __WXOSX__
+#    ifdef __WXMAC_XCODE__
+#        include <unistd.h>
+#        include "wx/mac/carbon/config_xcode.h"
+#    endif
+#endif
 /*
    first define Windows symbols if they're not defined on the command line: we
    can autodetect everything we need if _WIN32 is defined