From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 23 Feb 2005 16:54:16 +0000 (+0000)
Subject: don't redefine NOMINMAX if already defined (mingw32 does this apparently)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/a97cd79840edc011b8d2f4331b0f36c678c8abbf

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 f70ed821e1..a9a927d839 100644
--- 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
-#define NOMINMAX
+#ifndef NOMINMAX
+    #define NOMINMAX
+#endif // NOMINMAX
 
 #include <windows.h>