Bernie Bright:

I've defined snprintf as _snprintf in compiler.h for MSVC and MINGW
targets and removed duplicate definitions from FG sources.

diff --git a/src/Cockpit/radiostack.cxx b/src/Cockpit/radiostack.cxx
index 3215f00963081011c2aaee2a385ac0787d0320e7..ef570afbd1a74fe321e8267e9dee84f19dd79def 100644 (file)
--- a/src/Cockpit/radiostack.cxx
+++ b/src/Cockpit/radiostack.cxx
@@ -1172,11 +1172,7 @@ void FGRadioStack::search()
 
     if ( current_navlist->query( lon, lat, elev, adf_freq, &nav ) ) {
        char freq[128];
-#if defined( _MSC_VER ) || defined(__MINGW32__)
-       _snprintf( freq, 10, "%.0f", adf_freq );
-#else
        snprintf( freq, 10, "%.0f", adf_freq );
-#endif
        adf_ident = freq;
        adf_ident += nav.get_ident();
        // cout << "adf ident = " << adf_ident << endl;

diff --git a/src/GUI/gui.cxx b/src/GUI/gui.cxx
index 5d9f2ca0002ecb28af10cc0dd2021f6ff3064405..f49f14d2aeb9f33fafa92adb5a1c826916492d80 100644 (file)
--- a/src/GUI/gui.cxx
+++ b/src/GUI/gui.cxx
@@ -92,10 +92,6 @@ SG_USING_STD(string);
 SG_USING_STD(cout);
 #endif
 
-#if defined(_MSC_VER) || defined(__MINGW32__)
-#define  snprintf    _snprintf
-#endif   /* _MSC_VER */
-
 // main.cxx hack, should come from an include someplace
 extern void fgInitVisuals( void );
 extern void fgReshape( int width, int height );

diff --git a/src/Input/fgjs.cxx b/src/Input/fgjs.cxx
index 691c9df1a09e72e372199c4ccb9b1646e6228b6a..ffc978697dbb7128770d12048af3aa08ba09ccdb 100644 (file)
--- a/src/Input/fgjs.cxx
+++ b/src/Input/fgjs.cxx
@@ -36,10 +36,6 @@ SG_USING_STD(ios);
 #endif
 SG_USING_STD(string);
 
-#if defined(_MSC_VER) || defined(__MINGW32__)
-#define snprintf _snprintf
-#endif
-
 string axes_humannames[8] = { "elevator", "ailerons", "rudder", "throttle", 
                               "mixture","propller pitch", "lateral view", 
                               "longitudinal view" 

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 4cdd1c7d4fe03a123c941fd1caa44425fc331f2d..49aa6ca96fcc8d8165e3209d6af10b53f3018aef 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -1323,7 +1323,7 @@ int mainLoop( int argc, char **argv ) {
 #endif
 
     // set default log levels
-     sglog().setLogLevels( SG_ALL, SG_INFO );
+    sglog().setLogLevels( SG_ALL, SG_INFO );
 
     string version;
 #ifdef FLIGHTGEAR_VERSION
@@ -1333,7 +1333,7 @@ int mainLoop( int argc, char **argv ) {
 #endif
     SG_LOG( SG_GENERAL, SG_INFO, "FlightGear:  Version "
            << version );
-    SG_LOG( SG_GENERAL, SG_INFO, "Built with " << SG_COMPILER_STR );
+    SG_LOG( SG_GENERAL, SG_INFO, "Built with " << SG_COMPILER_STR << endl );
 
     // Allocate global data structures.  This needs to happen before
     // we parse command line options

diff --git a/src/Network/atc610x.cxx b/src/Network/atc610x.cxx
index c30a5ce2f09d60ca4d713e948b7b1943b7544d20..eb9a81194617be0d3a7fbb26260e6a2c231e3e85 100644 (file)
--- a/src/Network/atc610x.cxx
+++ b/src/Network/atc610x.cxx
@@ -52,10 +52,6 @@
 
 SG_USING_STD(string);
 
-#if defined( _MSC_VER ) || defined(__MINGW32__)
-#  define snprintf _snprintf
-#endif
-
 // Lock the ATC 610 hardware
 static int ATC610xLock( int fd ) {
     // rewind