don't redefine NOMINMAX if already defined (mingw32 does this apparently)

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

diff --git a/include/wx/msw/wrapwin.h b/include/wx/msw/wrapwin.h
index f70ed821e1ccef47d6c0b1c56e20d962a7a65517..a9a927d83969dc3f5a1c7d0dc39a1ee0421bb82b 100644 (file)
--- a/include/wx/msw/wrapwin.h
+++ b/include/wx/msw/wrapwin.h
@@ -18,7 +18,9 @@
 #endif
 
 // don't define min() and max() as macros, they conflict with standard C++ ones
 #endif
 
 // don't define min() and max() as macros, they conflict with standard C++ ones

-#define NOMINMAX
+#ifndef NOMINMAX
+    #define NOMINMAX
+#endif // NOMINMAX

 
 #include <windows.h>
 
 
 #include <windows.h>