diff --git a/src/Cockpit/radiostack.cxx b/src/Cockpit/radiostack.cxx index 3215f0096..ef570afbd 100644 --- 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 5d9f2ca00..f49f14d2a 100644 --- 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 691c9df1a..ffc978697 100644 --- 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 4cdd1c7d4..49aa6ca96 100644 --- 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 c30a5ce2f..eb9a81194 100644 --- 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