From 0f71d87a652c59cc443658b61025c0d31d9dfd79 Mon Sep 17 00:00:00 2001
From: Thomas Faber <thomas.faber@reactos.org>
Date: Wed, 12 Oct 2011 11:49:25 +0000
Subject: [PATCH] [STLPORT] - Revert r54088 [GLU32] - Do not use stlport
 headers with MSVC, as they are broken. Should really fix MSVC build

svn path=/trunk/; revision=54092
---
 reactos/dll/win32/glu32/CMakeLists.txt            | 4 +++-
 reactos/include/c++/stlport/stl/config/_windows.h | 4 ----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/reactos/dll/win32/glu32/CMakeLists.txt b/reactos/dll/win32/glu32/CMakeLists.txt
index 9b16182cce7..a40bee404ab 100644
--- a/reactos/dll/win32/glu32/CMakeLists.txt
+++ b/reactos/dll/win32/glu32/CMakeLists.txt
@@ -1,5 +1,7 @@
 
-set_cpp()
+if(NOT MSVC)
+    set_cpp()
+endif()
 
 add_definitions(
     -DRESOLVE_3D_TEXTURE_SUPPORT
diff --git a/reactos/include/c++/stlport/stl/config/_windows.h b/reactos/include/c++/stlport/stl/config/_windows.h
index c1fe09c35c5..ac9856eb31d 100644
--- a/reactos/include/c++/stlport/stl/config/_windows.h
+++ b/reactos/include/c++/stlport/stl/config/_windows.h
@@ -99,10 +99,6 @@ 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