no changes, just remove #if'd out code

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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 30936a7d16d1e1420f2522bc38e60c1cc67ca457..a1a2537981a591ccf1e0ec69d95cbc4ac3600355 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -35,17 +35,17 @@
 
 /* backwards compatible define, until configure gets updated */
 #if defined __WXMAC__
 
 /* backwards compatible define, until configure gets updated */
 #if defined __WXMAC__

-#define __WXOSX_CARBON__
+#define __WXOSX_CARBON__ 1

 #endif
 
 #if defined(__WXOSX_CARBON__) || defined(__WXOSX_COCOA__) || defined(__WXOSX_IPHONE__) 
 #endif
 
 #if defined(__WXOSX_CARBON__) || defined(__WXOSX_COCOA__) || defined(__WXOSX_IPHONE__) 

-#   define __WXOSX__
+#   define __WXOSX__ 1

 #endif
 
 #ifdef __WXOSX__
 /* for backwards compatibility of code (including our own) define __WXMAC__ */
 #   ifndef __WXMAC__
 #endif
 
 #ifdef __WXOSX__
 /* for backwards compatibility of code (including our own) define __WXMAC__ */
 #   ifndef __WXMAC__

-#       define __WXMAC__
+#       define __WXMAC__ 1

 #   endif
 /* setup precise defines according to sdk used */
 #   include <TargetConditionals.h>
 #   endif
 /* setup precise defines according to sdk used */
 #   include <TargetConditionals.h>


@@ -57,7 +57,7 @@
 #       if !( defined(TARGET_OS_MAC) && TARGET_OS_MAC )
 #           error "incorrect SDK for a Mac OS X build"
 #       endif
 #       if !( defined(TARGET_OS_MAC) && TARGET_OS_MAC )
 #           error "incorrect SDK for a Mac OS X build"
 #       endif

-#       define __WXOSX_MAC__
+#       define __WXOSX_MAC__ 1

 #   else
 #       error "one of __WXOSX_IPHONE__, __WXOSX_CARBON__ or __WXOSX_COCOA__ must be defined"
 #   endif
 #   else
 #       error "one of __WXOSX_IPHONE__, __WXOSX_CARBON__ or __WXOSX_COCOA__ must be defined"
 #   endif


@@ -100,7 +100,7 @@
 
  */
 #if defined(__WXOSX__) || (defined(__WXCOCOA__) && (!defined(wxUSE_BASE) || !wxUSE_BASE))
 
  */
 #if defined(__WXOSX__) || (defined(__WXCOCOA__) && (!defined(wxUSE_BASE) || !wxUSE_BASE))

-#   define __WXOSX_OR_COCOA__
+#   define __WXOSX_OR_COCOA__ 1

 #endif
 
 #ifdef __WXOSX_OR_COCOA__
 #endif
 
 #ifdef __WXOSX_OR_COCOA__


@@ -119,14 +119,6 @@
 #    ifndef __WXMSW__
 #        define __WXMSW__
 #    endif
 #    ifndef __WXMSW__
 #        define __WXMSW__
 #    endif

-
-#    ifndef _WIN32
-#        define _WIN32
-#    endif
-
-#    ifndef WIN32
-#        define WIN32
-#    endif

 #endif
 
 #if defined(__PALMOS__)
 #endif
 
 #if defined(__PALMOS__)


@@ -176,17 +168,25 @@
 #    ifndef __WXMSW__
 #        define __WXMSW__
 #    endif
 #    ifndef __WXMSW__
 #        define __WXMSW__
 #    endif

-
-#    ifndef __WIN32__
-#        define __WIN32__
-#    endif

 #endif /* Win32 */
 
 #endif /* Win32 */
 

-#if defined(__WXMSW__) || defined(__WIN32__)
+#if defined(__WXMSW__)

 #   if !defined(__WINDOWS__)
 #       define __WINDOWS__
 #   endif
 #   if !defined(__WINDOWS__)
 #       define __WINDOWS__
 #   endif

-#endif
+
+#   ifndef _WIN32
+#        define _WIN32
+#   endif
+
+#   ifndef WIN32
+#        define WIN32
+#   endif
+
+#   ifndef __WIN32__
+#        define __WIN32__
+#   endif
+#endif /* __WXMSW__ */

 
 /* detect MS SmartPhone */
 #if defined( WIN32_PLATFORM_WFSP )
 
 /* detect MS SmartPhone */
 #if defined( WIN32_PLATFORM_WFSP )


@@ -233,6 +233,10 @@
 #   endif
 #endif
 
 #   endif
 #endif
 

+#if defined(__WXWINCE__) && defined(_MSC_VER) && (_MSC_VER == 1201)
+    #define __EVC4__
+#endif
+

 #if defined(__POCKETPC__) || defined(__SMARTPHONE__) || defined(__WXGPE__)
 #   define __WXHANDHELD__
 #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
  */
    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
 #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"
     */
     #include "wx/setup_gccxml.h"

-#else
-    #include "wx/setup.h"

 #endif
 
 #endif
 

+

 /*
    Hardware platform detection.
 
 /*
    Hardware platform detection.
 


@@ -403,6 +409,10 @@
 
 #    ifdef __EMX__
 #        define OS2EMX_PLAIN_CHAR
 
 #    ifdef __EMX__
 #        define OS2EMX_PLAIN_CHAR

+#    endif
+#    if defined(__INNOTEK_LIBC__)
+        /* Ensure visibility of strnlen declaration */
+#        define _GNU_SOURCE

 #    endif
 
     /* define __HPUX__ for HP-UX where standard macro is __hpux */
 #    endif
 
     /* define __HPUX__ for HP-UX where standard macro is __hpux */