X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e1214731e30eb3c417d9f413e07143ee10f13b77..220bfe1596238999c60b810fcf0b86b74ed37e0b:/include/wx/platform.h?ds=inline

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 30936a7d16..642fdaeb96 100644
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -35,17 +35,17 @@
 
 /* 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__) 
-#   define __WXOSX__
+#   define __WXOSX__ 1
 #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>
@@ -57,7 +57,7 @@
 #       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
@@ -100,7 +100,7 @@
 
  */
 #if defined(__WXOSX__) || (defined(__WXCOCOA__) && (!defined(wxUSE_BASE) || !wxUSE_BASE))
-#   define __WXOSX_OR_COCOA__
+#   define __WXOSX_OR_COCOA__ 1
 #endif
 
 #ifdef __WXOSX_OR_COCOA__
@@ -119,14 +119,6 @@
 #    ifndef __WXMSW__
 #        define __WXMSW__
 #    endif
-
-#    ifndef _WIN32
-#        define _WIN32
-#    endif
-
-#    ifndef WIN32
-#        define WIN32
-#    endif
 #endif
 
 #if defined(__PALMOS__)
@@ -176,17 +168,25 @@
 #    ifndef __WXMSW__
 #        define __WXMSW__
 #    endif
-
-#    ifndef __WIN32__
-#        define __WIN32__
-#    endif
 #endif /* Win32 */
 
-#if defined(__WXMSW__) || defined(__WIN32__)
+#if defined(__WXMSW__)
 #   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 )
@@ -403,6 +403,10 @@
 
 #    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 */