From a97cd79840edc011b8d2f4331b0f36c678c8abbf Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 23 Feb 2005 16:54:16 +0000 Subject: [PATCH] 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 --- include/wx/msw/wrapwin.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 -- 2.50.0