NOMINMAX fix ...

diff --git a/configure.ac b/configure.ac
index 38f795832a1c63489a196a64a34ff206f35bdf27..032cf0d0684890cec90d4fcdbc25ddda71802125 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -216,6 +216,7 @@ else
 
     echo Win32 specific hacks...
     AC_DEFINE([WIN32], 1, [Define for Win32 platforms])
+    AC_DEFINE([NOMINMAX], 1, [Define for Win32 platforms])
 
     dnl just define these to true and hope for the best
     ac_cv_lib_glut_glutGetModifiers="yes"

diff --git a/simgear/compiler.h b/simgear/compiler.h
index eb6c162857d50e71c5ff32c89f7155b71819913e..4a40c9fc15af015acebde2a91f9d1f779bd19858 100644 (file)
--- a/simgear/compiler.h
+++ b/simgear/compiler.h
@@ -141,12 +141,6 @@
 #      define STL_STDEXCEPT  <stdexcept>
 #      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

diff --git a/simgear/math/sg_types.hxx b/simgear/math/sg_types.hxx
index 578c61274285c4e58a5c060d1697f46109de2021..0a3454a48bbba948027dd3b4ed6f18804c3db307 100644 (file)
--- a/simgear/math/sg_types.hxx
+++ b/simgear/math/sg_types.hxx
@@ -49,6 +49,11 @@ typedef vector < int > int_list;
 typedef int_list::iterator int_list_iterator;
 typedef int_list::const_iterator const_int_list_iterator;
 
+/** STL vector list of doubles */
+typedef vector < double > double_list;
+typedef double_list::iterator double_list_iterator;
+typedef double_list::const_iterator const_double_list_iterator;
+
 /** STL vector list of Point3D */
 typedef vector < Point3D > point_list;
 typedef point_list::iterator point_list_iterator;