MS patch from Norm Vine to fix min/max macro defs.

[simgear.git] / simgear / compiler.h

diff --git a/simgear/compiler.h b/simgear/compiler.h
index e80b1826d2fc1cf18f379aff5ab5d8d4b439da2f..eb6c162857d50e71c5ff32c89f7155b71819913e 100644 (file)
--- a/simgear/compiler.h
+++ b/simgear/compiler.h
@@ -142,6 +142,11 @@
 #      define STL_STRING     <string>
 #      define STL_STRSTREAM  <strstream>
 
+# ifdef WIN32
+       // keep windows.h from #defining min() max() macros
+#      define NOMINMAX
+#endif
+
 #  else
 #    error Time to upgrade. GNU compilers < 2.7 not supported
 #  endif