MSVC6 updates

diff --git a/src/FDM/JSBSim/FGJSBBase.h b/src/FDM/JSBSim/FGJSBBase.h
index 49275cff0adfec51e38e98332959a231736b38cc..3bb80e6d3fb9b90a5f5cd4a5975de476b26861c8 100644 (file)
--- a/src/FDM/JSBSim/FGJSBBase.h
+++ b/src/FDM/JSBSim/FGJSBBase.h
@@ -71,8 +71,9 @@ using std::queue;
 
 #endif
 
-
+#if !defined(WIN32) || defined(__GNUC__)
 using std::max;
+#endif
 
 #ifdef __FreeBSD__ // define gcvt on FreeBSD
 

diff --git a/src/GUI/new_gui.cxx b/src/GUI/new_gui.cxx
index 67edea6097ad7b1bcf6629bc44af4650f8a5c873..63f41cba969ed3dc994eedf5b7233f6b6ee30a07 100644 (file)
--- a/src/GUI/new_gui.cxx
+++ b/src/GUI/new_gui.cxx
@@ -5,12 +5,14 @@
 #include <plib/pu.h>
 #include <plib/ul.h>
 
+#include <simgear/compiler.h>
 #include <simgear/misc/exception.hxx>
 #include <Main/fg_props.hxx>
 
 #include "menubar.hxx"
 #include "dialog.hxx"
 
+SG_USING_STD(map);
 
 \f
 ////////////////////////////////////////////////////////////////////////