MACOS -> macintosh

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
 

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
 

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 <sioux.h> // 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 );

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

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;

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;

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

src/Time/moonpos.hxx

@@ -48,7 +48,7 @@
 
 #ifdef FG_HAVE_STD_INCLUDES
 #  include <ctime>
-#  ifdef MACOS
+#  ifdef macintosh
      FG_USING_STD(time_t);
 #  endif
 #else

src/Time/sunpos.cxx

@@ -44,7 +44,7 @@
 #  include <cmath>
 #  include <cstdio>
 #  include <ctime>
-#  ifdef MACOS
+#  ifdef macintosh
      FG_USING_STD(time_t);
 #  endif
 #else

src/Time/timestamp.hxx

@@ -57,7 +57,7 @@
 #endif
 
 // -dw- want to use metrowerks time.h
-#ifdef MACOS
+#ifdef macintosh
 #  include <time.h>
 #  include <timer.h>
 #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);
 	

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

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

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.