[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

diff --git a/reactos/dll/win32/glu32/CMakeLists.txt b/reactos/dll/win32/glu32/CMakeLists.txt
index 9b16182..a40bee4 100644 (file)
--- 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 c1fe09c..ac9856e 100644 (file)
--- 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