]> git.mxchange.org Git - flightgear.git/commitdiff
MSVC8 fixes.
authorehofman <ehofman>
Sun, 11 Dec 2005 12:53:54 +0000 (12:53 +0000)
committerehofman <ehofman>
Sun, 11 Dec 2005 12:53:54 +0000 (12:53 +0000)
src/FDM/JSBSim/FGJSBBase.h

index 34537f0582facbfa4849c90bd63a3dde91625e52..7b75f84c6587972dbf234cff6c3f90046b49f5a3 100644 (file)
@@ -42,6 +42,7 @@ INCLUDES
 
 #ifdef FGFS
 #  include <simgear/compiler.h>
+#  include <simgear/constants.h>
 #  include <math.h>
 #  include <queue>
 #  include STL_STRING
@@ -49,7 +50,6 @@ INCLUDES
 SG_USING_STD(string);
 
 # ifndef M_PI
-#  include <simgear/constants.h>
 #  define M_PI SG_PI
 # endif
 
@@ -71,7 +71,7 @@ using std::string;
 
 #endif
 
-#if !defined(WIN32) || defined(__GNUC__)
+#if !defined(WIN32) || defined(__GNUC__) || ( defined(_MSC_VER) && (_MSC_VER >= 1400)) 
 using std::max;
 #endif