From: Thomas Faber <thomas.faber@reactos.org>
Date: Wed, 12 Oct 2011 09:05:23 +0000 (+0000)
Subject: [STLPORT]
X-Git-Tag: backups/iut-netsh@54410~299
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=7bdbe2072c75969636171cc3eee8b9fdc3aa94fb;hp=2381ccd2f02b978f0fc1be38c3d36807d35d356c;ds=inline

[STLPORT]
- Do not define min() or max() when standard headers are included. Should fix MSVC build

svn path=/trunk/; revision=54088
---

diff --git a/reactos/include/c++/stlport/stl/config/_windows.h b/reactos/include/c++/stlport/stl/config/_windows.h
index ac9856eb31d..c1fe09c35c5 100644
--- a/reactos/include/c++/stlport/stl/config/_windows.h
+++ b/reactos/include/c++/stlport/stl/config/_windows.h
@@ -99,6 +99,10 @@ extern "C" {
 #      if !defined(WIN32_NO_STATUS)
 #        define WIN32_NO_STATUS
 #      endif
+/* Don't let windows.h define its min and max macros. */
+#      if !defined (NOMINMAX)
+#        define NOMINMAX
+#      endif
 #      include <windef.h>
 
 #ifndef InterlockedIncrement