Patch Windows macros in arch_setup.h so we don't have to define a bunch of them on...

diff --git a/src/archutils/Win32/arch_setup.h b/src/archutils/Win32/arch_setup.h
index c270cf8..fc14658 100644 (file)
--- a/src/archutils/Win32/arch_setup.h
+++ b/src/archutils/Win32/arch_setup.h
@@ -5,6 +5,13 @@
 #define SUPPORT_OPENGL\r
 #endif\r
 \r
+/* We're using different macros through the codebase. Declare them all here */\r
+#ifdef _WIN32\r
+#define WIN32\r
+#define WINDOWS\r
+#define _WINDOWS\r
+#endif\r
+\r
 #define SUPPORT_D3D\r
 \r
 /* Fix VC breakage. */\r

diff --git a/src/global.h b/src/global.h
index a167dd0..86b06ed 100644 (file)
--- a/src/global.h
+++ b/src/global.h
@@ -13,7 +13,7 @@
 #define __STDC_CONSTANT_MACROS // for INT64_C, etc
 
 /* Platform-specific fixes. */
-#if defined(WIN32)
+#if defined(_WIN32)
 #include "archutils/Win32/arch_setup.h"
 #elif defined(PBBUILD)
 #include "archutils/Darwin/arch_setup.h"