applied patch 417699 (remove WXDLLEXPORT from inline functions)

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index b3893851f5e0bcb02422f994bc5f4699552ccad3..aa702b207e6e0d7aca005b23d16005b9f611f617 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -53,30 +53,42 @@
     #endif
 
     #if defined(__APPLE__)
-       // MacOS X
+        // MacOS X
         #ifndef __WXMAC__
             #define __WXMAC__
         #endif
         #ifndef __WXMAC_X__
+            // This define really should not be necessary since __WXMAC__
+            // combined with __UNIX__ is sufficient to differentiate
+            // Classic Mac OS from Mac OS X. However, some code has been
+            // added to workaround defects(?) in the bundled gcc compiler
+            // and these corrections are identified by __WXMAC_X__
             #define __WXMAC_X__
         #endif
-    
+
         #define PM_USE_SESSION_APIS 0
         #include <Carbon/Carbon.h>
     #endif
-#elif defined(applec) || defined(THINK_C) || (defined(__MWERKS__) && !defined(__INTEL__))
-        // MacOS
+#elif defined(applec) || \
+      defined(THINK_C) || \
+      (defined(__MWERKS__) && !defined(__INTEL__))
+      // MacOS
 #elif defined(__WXMAC__) && defined(__APPLE__)
-       // MacOS X
+    // MacOS X
     #define __UNIX_LIKE__
 
     #ifndef __WXMAC__
         #define __WXMAC__
     #endif
     #ifndef __WXMAC_X__
+        // This define really should not be necessary since __WXMAC__
+        // combined with __UNIX__ is sufficient to differentiate
+        // Classic Mac OS from Mac OS X. However, some code has been
+        // added to workaround defects(?) in the bundled gcc compiler
+        // and these corrections are identified by __WXMAC_X__
         #define __WXMAC_X__
     #endif
-    
+
     #define PM_USE_SESSION_APIS 0
     #include <Carbon/Carbon.h>
 #elif defined(__OS2__)
@@ -166,7 +178,10 @@
 #endif // HP-UX
 
 #if defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || defined( __CYGWIN__ )
-#include "wx/msw/gccpriv.h"
+    #include "wx/msw/gccpriv.h"
+#else
+    #undef wxCHECK_W32API_VERSION
+    #define wxCHECK_W32API_VERSION(maj, min) (0)
 #endif
 
 //////////////////////////////////////////////////////////////////////////////////