From 7bdbe2072c75969636171cc3eee8b9fdc3aa94fb Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Wed, 12 Oct 2011 09:05:23 +0000 Subject: [PATCH 1/1] [STLPORT] - Do not define min() or max() when standard headers are included. Should fix MSVC build svn path=/trunk/; revision=54088 --- reactos/include/c++/stlport/stl/config/_windows.h | 4 ++++ 1 file changed, 4 insertions(+) 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 #ifndef InterlockedIncrement -- 2.17.1