From 2fb961c92289a696f0be05208e5fb067d0e46a87 Mon Sep 17 00:00:00 2001 From: curt Date: Mon, 2 Dec 2002 22:12:22 +0000 Subject: [PATCH] NOMINMAX fix ... --- configure.ac | 1 + simgear/compiler.h | 6 ------ simgear/math/sg_types.hxx | 5 +++++ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 38f79583..032cf0d0 100644 --- 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 eb6c1628..4a40c9fc 100644 --- a/simgear/compiler.h +++ b/simgear/compiler.h @@ -141,12 +141,6 @@ # define STL_STDEXCEPT # define STL_STRING # define STL_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 578c6127..0a3454a4 100644 --- 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; -- 2.39.5