X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f79bd02d8e266982041053fece8076abf89cd5d3..798a4529fe37bfd1864b4ed350e7de603bd40f2b:/include/wx/platform.h

diff --git a/include/wx/platform.h b/include/wx/platform.h
index d728ebf0ee..bed5fd62c2 100644
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -18,7 +18,7 @@
    first define Windows symbols if they're not defined on the command line: we
    can autodetect everything we need if _WIN32 is defined
  */
-#if defined(_WIN32) || defined(WIN32) || defined(__NT__)
+#if defined(_WIN32) || defined(WIN32) || defined(__NT__) || defined(__WXWINCE__)
     #ifndef __WXMSW__
         #define __WXMSW__
     #endif
@@ -146,14 +146,37 @@
       defined(THINK_C) || \
       (defined(__MWERKS__) && !defined(__INTEL__))
       /* MacOS */
-#elif defined(__WXMAC__) && defined(__DARWIN__)
+    #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
+
+    #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 corrections necessary for Darwin (wxMac, wxMotif)
+       bundled gcc compiler. These corrections are identified by
+       __DARWIN__ for Darwin related corrections (wxMac, wxMotif)
      */
 #elif defined(__OS2__)
     #if defined(__IBMCPP__)
@@ -221,6 +244,20 @@
     #define __X__
 #endif
 
+/*
+   This macro can be used to test the gcc version and can be used like this:
+
+    #if wxCHECK_GCC_VERSION(3, 1)
+        ... we have gcc 3.1 or later ...
+    #else
+        ... no gcc at all or gcc < 3.1 ...
+    #endif
+*/
+#define wxCHECK_GCC_VERSION( major, minor ) \
+    ( defined(__GNUC__) && defined(__GNUC_MINOR__) \
+    && ( ( __GNUC__ > (major) ) \
+        || ( __GNUC__ == (major) && __GNUC_MINOR__ >= (minor) ) ) )
+
 /*
    This macro can be used to check that the version of mingw32 compiler is
    at least maj.min