X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2f2635175aeb1a0a048d0f92e1ac761d716935ed..a721fd82b7ca8c97048453d4aaff559e8f741d69:/include/wx/platform.h

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 0e08706830..d6c317db1f 100644
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -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 */
@@ -665,10 +669,16 @@
 /* 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