From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 30 Dec 2008 11:01:28 +0000 (+0000)
Subject: ensure that WIN32 is defined, winsock2.h relies on it being defined and fails in... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/c65f4634bc616e389f0d99ae71be7d585f3b2c54

ensure that WIN32 is defined, winsock2.h relies on it being defined and fails in interesting ways (by silently changing the struct alignment resulting in difficult to diagnose crashes later) if it isn't

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57654 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 30936a7d16..7e1124426e 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 )