Updated to Scintilla from 1.45 to 1.47

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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 005719486bc88962e5a8ea9866d572f1c054f22f..60c5770ed0dbac6f7f337969a720267fb6163b73 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -146,6 +146,9 @@
       defined(THINK_C) || \
       (defined(__MWERKS__) && !defined(__INTEL__))
       /* MacOS */
+    #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__
@@ -167,6 +170,9 @@
         #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
@@ -238,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