fly/flightgear
1
0
Fork 0
Code Activity

Bernie Bright:

Browse source 
I've defined snprintf as _snprintf in compiler.h for MSVC and MINGW
targets and removed duplicate definitions from FG sources.
This commit is contained in:
curt 2002-05-17 16:41:27 +00:00
parent 279643226a
commit fcd6b28e0f
5 changed files with 2 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Cockpit/radiostack.cxx
View file

@ -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;

4
src/GUI/gui.cxx
View file

@ -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 );

4
src/Input/fgjs.cxx
View file

@ -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"

4
src/Main/main.cxx
View file

@ -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

4
src/Network/atc610x.cxx
View file

@ -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