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

tfaber at svn.reactos.org tfaber at svn.reactos.org
Wed Oct 12 09:05:25 UTC 2011


Author: tfaber
Date: Wed Oct 12 09:05:23 2011
New Revision: 54088

URL: http://svn.reactos.org/svn/reactos?rev=54088&view=rev
Log:
[STLPORT]
- Do not define min() or max() when standard headers are included. Should fix MSVC build

Modified:
    trunk/reactos/include/c++/stlport/stl/config/_windows.h

Modified: trunk/reactos/include/c++/stlport/stl/config/_windows.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/c%2B%2B/stlport/stl/config/_windows.h?rev=54088&r1=54087&r2=54088&view=diff
==============================================================================
--- trunk/reactos/include/c++/stlport/stl/config/_windows.h [iso-8859-1] (original)
+++ trunk/reactos/include/c++/stlport/stl/config/_windows.h [iso-8859-1] Wed Oct 12 09:05:23 2011
@@ -98,6 +98,10 @@
 /* Define WIN32_NO_STATUS to prevent status codes redefinitions */
 #      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>
 




More information about the Ros-diffs mailing list