X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2d14a14c573db4b8f8959b1460a269cf23defbcf..1bfcd80c2f6ef72fdefba3695a1f6fd8088ba15d:/include/wx/platform.h

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 642fdaeb96..abb2278afb 100644
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -38,7 +38,7 @@
 #define __WXOSX_CARBON__ 1
 #endif
 
-#if defined(__WXOSX_CARBON__) || defined(__WXOSX_COCOA__) || defined(__WXOSX_IPHONE__) 
+#if defined(__WXOSX_CARBON__) || defined(__WXOSX_COCOA__) || defined(__WXOSX_IPHONE__)
 #   define __WXOSX__ 1
 #endif
 
@@ -49,7 +49,7 @@
 #   endif
 /* setup precise defines according to sdk used */
 #   include <TargetConditionals.h>
-#   if defined(__WXOSX_IPHONE__) 
+#   if defined(__WXOSX_IPHONE__)
 #       if !( defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE )
 #           error "incorrect SDK for an iPhone build"
 #       endif
@@ -233,6 +233,10 @@
 #   endif
 #endif
 
+#if defined(__WXWINCE__) && defined(_MSC_VER) && (_MSC_VER == 1201)
+    #define __EVC4__
+#endif
+
 #if defined(__POCKETPC__) || defined(__SMARTPHONE__) || defined(__WXGPE__)
 #   define __WXHANDHELD__
 #endif
@@ -244,16 +248,18 @@
    Note that it must be included before defining hardware symbols below as they
    could be already defined by configure
  */
+#include "wx/setup.h"
+
 #ifdef __GCCXML__
     /*
         we're using gccxml to create an XML representation of the entire
-        wxWidgets interface; pass it a special setup.h file
+        wxWidgets interface; use a special setup_gccxml.h file to fix some
+        of the stuff #defined by the real setup.h
     */
     #include "wx/setup_gccxml.h"
-#else
-    #include "wx/setup.h"
 #endif
 
+
 /*
    Hardware platform detection.
 
@@ -332,18 +338,22 @@
 
 
 /*
-   This macro can be used to test the Open Watcom version.
+   Define Watcom-specific macros.
 */
 #ifndef __WATCOMC__
 #   define wxWATCOM_VERSION(major,minor) 0
 #   define wxCHECK_WATCOM_VERSION(major,minor) 0
 #   define wxONLY_WATCOM_EARLIER_THAN(major,minor) 0
-#elif defined(__WATCOMC__) && __WATCOMC__ < 1200
-#   error "Only Open Watcom is supported in this release"
+#   define WX_WATCOM_ONLY_CODE( x )
 #else
+#   if __WATCOMC__ < 1200
+#       error "Only Open Watcom is supported in this release"
+#   endif
+
 #   define wxWATCOM_VERSION(major,minor) ( major * 100 + minor * 10 + 1100 )
 #   define wxCHECK_WATCOM_VERSION(major,minor) ( __WATCOMC__ >= wxWATCOM_VERSION(major,minor) )
 #   define wxONLY_WATCOM_EARLIER_THAN(major,minor) ( __WATCOMC__ < wxWATCOM_VERSION(major,minor) )
+#   define WX_WATCOM_ONLY_CODE( x )  x
 #endif
 
 /*
@@ -668,21 +678,21 @@
 #endif
 /* also the 32/64 bit universal builds must be handled accordingly */
 #ifdef __DARWIN__
-#	ifdef __LP64__
-#		undef SIZEOF_VOID_P 
-#		undef SIZEOF_LONG 
-#		undef SIZEOF_SIZE_T 
-#		define SIZEOF_VOID_P 8
-#		define SIZEOF_LONG 8
-#		define SIZEOF_SIZE_T 8
-#	else
-#		undef SIZEOF_VOID_P 
-#		undef SIZEOF_LONG 
-#		undef SIZEOF_SIZE_T 
-#		define SIZEOF_VOID_P 4
-#		define SIZEOF_LONG 4
-#		define SIZEOF_SIZE_T 4
-#	endif
+#    ifdef __LP64__
+#        undef SIZEOF_VOID_P
+#        undef SIZEOF_LONG
+#        undef SIZEOF_SIZE_T
+#        define SIZEOF_VOID_P 8
+#        define SIZEOF_LONG 8
+#        define SIZEOF_SIZE_T 8
+#    else
+#        undef SIZEOF_VOID_P
+#        undef SIZEOF_LONG
+#        undef SIZEOF_SIZE_T
+#        define SIZEOF_VOID_P 4
+#        define SIZEOF_LONG 4
+#        define SIZEOF_SIZE_T 4
+#    endif
 #endif
 /*
    check the consistency of the settings in setup.h: note that this must be