Merge pull request #3 from arsenm/master

Only define feature-disabling Win32 macros if not defined already.
2012-03-29 16:28:39 -07:00 · 2012-03-29 16:28:39 -07:00 · bae93ac1e1
commit bae93ac1e1
parent fcf54b4b27 3bcde7e1cd
1 changed files with 7 additions and 2 deletions
--- a/src/win32_platform.h
+++ b/src/win32_platform.h
@ -33,8 +33,13 @@


 // We don't need all the fancy stuff
-#define NOMINMAX
-#define VC_EXTRALEAN
+#ifndef NOMINMAX
+ #define NOMINMAX
+#endif
+
+#ifndef VC_EXTRALEAN
+ #define VC_EXTRALEAN
+#endif

 #ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN