From 655ce0e20dbe1c8d902d753baee27f77b61fdaf2 Mon Sep 17 00:00:00 2001 From: curt Date: Sun, 10 Sep 2000 00:04:50 +0000 Subject: [PATCH] MACOS -> macintosh --- src/FDM/UIUCModel/uiuc_aircraft.h | 2 +- src/Main/fg_init.cxx | 2 +- src/Main/main.cxx | 8 ++++---- src/Main/options.cxx | 4 ++-- src/Objects/obj.cxx | 6 +++--- src/Scenery/tilecache.cxx | 2 +- src/Scenery/tileentry.cxx | 4 ++-- src/Time/moonpos.hxx | 2 +- src/Time/sunpos.cxx | 2 +- src/Time/timestamp.hxx | 4 ++-- src/WeatherCM/FGLocalWeatherDatabase.cpp | 2 +- src/WeatherCM/FGLocalWeatherDatabase.h | 2 +- src/WeatherCM/sphrintp.h | 2 +- 13 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/FDM/UIUCModel/uiuc_aircraft.h b/src/FDM/UIUCModel/uiuc_aircraft.h index 7fb4cc2c0..b05a970cf 100644 --- a/src/FDM/UIUCModel/uiuc_aircraft.h +++ b/src/FDM/UIUCModel/uiuc_aircraft.h @@ -100,7 +100,7 @@ FG_USING_STD(map); FG_USING_STD(iostream); -#if defined ( MACOS ) || defined ( _MSC_VER ) +#if defined ( macintosh ) || defined ( _MSC_VER ) FG_USING_STD(ofstream); #endif diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx index 50e46c70e..64f96e26d 100644 --- a/src/Main/fg_init.cxx +++ b/src/Main/fg_init.cxx @@ -695,7 +695,7 @@ bool fgInitSubsystems( void ) { NewAltitudeInit(); // Initialize I/O channels -#if ! defined( MACOS ) +#if ! defined( macintosh ) fgIOInit(); #endif diff --git a/src/Main/main.cxx b/src/Main/main.cxx index f49f3373e..626c85f7e 100644 --- a/src/Main/main.cxx +++ b/src/Main/main.cxx @@ -113,7 +113,7 @@ // -dw- use custom sioux settings so I can see output window -#ifdef MACOS +#ifdef macintosh # ifndef FG_NDEBUG # include // settings for output window # endif @@ -874,7 +874,7 @@ static void fgMainLoop( void ) { } } -#if ! defined( MACOS ) +#if ! defined( macintosh ) // Do any I/O channel work that might need to be done fgIOProcess(); #endif @@ -1152,7 +1152,7 @@ void fgReshape( int width, int height ) { // Initialize GLUT and define a main window int fgGlutInit( int *argc, char **argv ) { -#if !defined( MACOS ) +#if !defined( macintosh ) // GLUT will extract all glut specific options so later on we only // need wory about our own. glutInit(argc, argv); @@ -1265,7 +1265,7 @@ int fgGlutInitEvents( void ) { // Main ... int main( int argc, char **argv ) { -#if defined( MACOS ) +#if defined( macintosh ) freopen ("stdout.txt", "w", stdout ); freopen ("stderr.txt", "w", stderr ); argc = ccommand( &argv ); diff --git a/src/Main/options.cxx b/src/Main/options.cxx index b96105b02..30800f589 100644 --- a/src/Main/options.cxx +++ b/src/Main/options.cxx @@ -214,7 +214,7 @@ fgOPTIONS::fgOPTIONS() : #if defined( WIN32 ) fg_root = "\\FlightGear"; -#elif defined( MACOS ) +#elif defined( macintosh ) fg_root = ""; #else fg_root = PKGLIBDIR; @@ -899,7 +899,7 @@ int fgOPTIONS::parse_config_file( const string& path ) { #ifdef GETLINE_NEEDS_TERMINATOR getline( in, line, '\n' ); -#elif defined (MACOS) +#elif defined( macintosh ) getline( in, line, '\r' ); #else getline( in, line ); diff --git a/src/Objects/obj.cxx b/src/Objects/obj.cxx index 33a7ccbcf..2f7cef034 100644 --- a/src/Objects/obj.cxx +++ b/src/Objects/obj.cxx @@ -338,7 +338,7 @@ ssgBranch *fgObjLoad( const string& path, FGTileEntry *t, const bool is_base) { while ( ! in.eof() ) { #endif -#if defined( MACOS ) +#if defined( macintosh ) in >> ::skipws; #else in >> skipws; @@ -572,7 +572,7 @@ ssgBranch *fgObjLoad( const string& path, FGTileEntry *t, const bool is_base) { // read all subsequent numbers until next thing isn't a number while ( true ) { -#if defined( MACOS ) +#if defined( macintosh ) in >> ::skipws; #else in >> skipws; @@ -673,7 +673,7 @@ ssgBranch *fgObjLoad( const string& path, FGTileEntry *t, const bool is_base) { // eat white space before start of while loop so if we are // done with useful input it is noticed before hand. -#if defined( MACOS ) +#if defined( macintosh ) in >> ::skipws; #else in >> skipws; diff --git a/src/Scenery/tilecache.cxx b/src/Scenery/tilecache.cxx index 1bca11ee3..db2d98c6e 100644 --- a/src/Scenery/tilecache.cxx +++ b/src/Scenery/tilecache.cxx @@ -205,7 +205,7 @@ FGTileCache::fill_in( int index, const FGBucket& p ) while ( ! in.eof() ) { in >> token; in >> name; -#if defined ( MACOS ) || defined ( _MSC_VER ) +#if defined ( macintosh ) || defined ( _MSC_VER ) in >> ::skipws; #else in >> skipws; diff --git a/src/Scenery/tileentry.cxx b/src/Scenery/tileentry.cxx index 05a7eb1ae..573a52346 100644 --- a/src/Scenery/tileentry.cxx +++ b/src/Scenery/tileentry.cxx @@ -94,7 +94,7 @@ void FGTileEntry::free_tile() { << " texture coordinate arrays" ); for ( i = 0; i < (int)vec3_ptrs.size(); ++i ) { -#ifdef MACOS +#ifdef macintosh delete [] vec3_ptrs[i]; #else delete vec3_ptrs[i]; @@ -103,7 +103,7 @@ void FGTileEntry::free_tile() { vec3_ptrs.clear(); for ( i = 0; i < (int)vec2_ptrs.size(); ++i ) { -#ifdef MACOS +#ifdef macintosh delete [] vec2_ptrs[i]; #else delete vec2_ptrs[i]; diff --git a/src/Time/moonpos.hxx b/src/Time/moonpos.hxx index 5c04315f6..65e544ac2 100644 --- a/src/Time/moonpos.hxx +++ b/src/Time/moonpos.hxx @@ -48,7 +48,7 @@ #ifdef FG_HAVE_STD_INCLUDES # include -# ifdef MACOS +# ifdef macintosh FG_USING_STD(time_t); # endif #else diff --git a/src/Time/sunpos.cxx b/src/Time/sunpos.cxx index c22f57f2a..f79390957 100644 --- a/src/Time/sunpos.cxx +++ b/src/Time/sunpos.cxx @@ -44,7 +44,7 @@ # include # include # include -# ifdef MACOS +# ifdef macintosh FG_USING_STD(time_t); # endif #else diff --git a/src/Time/timestamp.hxx b/src/Time/timestamp.hxx index 1a50c7884..563b8f43f 100644 --- a/src/Time/timestamp.hxx +++ b/src/Time/timestamp.hxx @@ -57,7 +57,7 @@ #endif // -dw- want to use metrowerks time.h -#ifdef MACOS +#ifdef macintosh # include # include #endif @@ -143,7 +143,7 @@ inline void FGTimeStamp::stamp() { seconds = current.time; usec = current.millitm * 1000; // -dw- uses time manager -#elif defined( MACOS ) +#elif defined( macintosh ) UnsignedWide ms; Microseconds(&ms); diff --git a/src/WeatherCM/FGLocalWeatherDatabase.cpp b/src/WeatherCM/FGLocalWeatherDatabase.cpp index da85deea1..a2fbe0bd2 100644 --- a/src/WeatherCM/FGLocalWeatherDatabase.cpp +++ b/src/WeatherCM/FGLocalWeatherDatabase.cpp @@ -205,7 +205,7 @@ FGPhysicalProperty FGLocalWeatherDatabase::get(const sgVec3& p) const return FGPhysicalProperty(database->Evaluate(p), p[3]); } -#ifdef MACOS +#ifdef macintosh /* fix a problem with mw compilers in that they don't know the difference between the next two methods. Since the first one doesn't seem to be used anywhere, I commented it out. This is diff --git a/src/WeatherCM/FGLocalWeatherDatabase.h b/src/WeatherCM/FGLocalWeatherDatabase.h index 8dd8aeeb6..213f07d18 100644 --- a/src/WeatherCM/FGLocalWeatherDatabase.h +++ b/src/WeatherCM/FGLocalWeatherDatabase.h @@ -164,7 +164,7 @@ public: /************************************************************************/ /* Get the physical properties on the specified point p */ /************************************************************************/ -#ifdef MACOS +#ifdef macintosh /* fix a problem with mw compilers in that they don't know the difference between the next two methods. Since the first one doesn't seem to be used anywhere, I commented it out. This is diff --git a/src/WeatherCM/sphrintp.h b/src/WeatherCM/sphrintp.h index 78ab4bd47..e5debcab7 100644 --- a/src/WeatherCM/sphrintp.h +++ b/src/WeatherCM/sphrintp.h @@ -51,7 +51,7 @@ public: int Evaluate (const double x, const double y, const double z, T& f) const; int Evaluate (const double thetaAngle, const double phiAngle, T& f) const; -#ifndef MACOS +#ifndef macintosh // CodeWarrior doesn't know the differece between sgVec2 and // sgVec3, so I commented this out for Mac builds. This change is // related to a similar change in FGLocalWeatherDatabase module.