remove macintosh (note: not MacOS-X) and MWERKS workarounds.

src/FDM/JSBSim/FGFDMExec.cpp

@@ -479,10 +479,6 @@ bool FGFDMExec::LoadModel(string model, bool addModelToPath)
 
   modelName = model; // Set the class modelName attribute
 
-# ifdef macintosh
-    separator = ";";
-# endif
-
   if( AircraftPath.empty() || EnginePath.empty() || SystemsPath.empty()) {
     cerr << "Error: attempted to load aircraft with undefined ";
     cerr << "aircraft, engine, and system paths" << endl;

src/FDM/JSBSim/JSBSim.cxx

@@ -311,6 +311,7 @@ void FGJSBsim::init()
                   9.0/5.0*(temperature->getDoubleValue()+273.15) );
       Atmosphere->SetExPressure(pressure->getDoubleValue()*70.726566);
       Atmosphere->SetExDensity(density->getDoubleValue());
+      Atmosphere->SetTurbType(FGAtmosphere::ttCulp);
       Atmosphere->SetTurbGain(turbulence_gain->getDoubleValue());
       Atmosphere->SetTurbRate(turbulence_rate->getDoubleValue());
 

src/FDM/JSBSim/initialization/FGInitialCondition.cpp

@@ -826,10 +826,6 @@ bool FGInitialCondition::Load(string rstfile, bool useStoredPath)
   int n;
 
   string sep = "/";
-# ifdef macintosh
-   sep = ";";
-# endif
-
   if( useStoredPath ) {
     init_file_name = fdmex->GetFullAircraftPath() + sep + rstfile + ".xml";
   } else {

src/FDM/JSBSim/input_output/FGfdmSocket.cpp

@@ -205,10 +205,8 @@ FGfdmSocket::FGfdmSocket(int port)
 
 FGfdmSocket::~FGfdmSocket()
 {
-  #ifndef macintosh
   if (sckt) shutdown(sckt,2);
   if (sckt_in) shutdown(sckt_in,2);
-  #endif
 
   #ifdef __BORLANDC__
     WSACleanup();

src/FDM/JSBSim/models/FGAerodynamics.cpp

@@ -308,9 +308,6 @@ bool FGAerodynamics::Load(Element *element)
   Element *temp_element, *axis_element, *function_element;
 
   string separator = "/";
-#ifdef macintosh
-  separator = ";";
-#endif
 
   fname = element->GetAttributeValue("file");
   if (!fname.empty()) {

src/FDM/JSBSim/models/FGBuoyantForces.cpp

@@ -116,9 +116,6 @@ bool FGBuoyantForces::Load(Element *element)
   Debug(2);
 
   string separator = "/";
-#ifdef macintosh
-  separator = ";";
-#endif
 
   fname = element->GetAttributeValue("file");
   if (!fname.empty()) {

src/FDM/JSBSim/models/FGFCS.cpp

@@ -494,9 +494,6 @@ bool FGFCS::Load(Element* el, SystemType systype)
   Components=0;
 
   string separator = "/";
-#ifdef macintosh
-  separator = ";";
-#endif
 
 // ToDo: The handling of name and file attributes could be improved, here,
 //       considering that a name can be in the external file, as well.
@@ -649,9 +646,6 @@ string FGFCS::FindSystemFullPathname(string system_filename)
   ifstream system_file;
 
   string separator = "/";
-# ifdef macintosh
-  separator = ";";
-# endif
 
   fullpath = systemPath + separator;
   localpath = aircraftPath + separator + "Systems" + separator;
@@ -680,9 +674,6 @@ ifstream* FGFCS::FindSystemFile(string system_filename)
   ifstream* system_file = new ifstream();
 
   string separator = "/";
-# ifdef macintosh
-  separator = ";";
-# endif
 
   fullpath = systemPath + separator;
   localpath = aircraftPath + separator + "Systems" + separator;

src/FDM/JSBSim/models/FGOutput.cpp

@@ -885,9 +885,6 @@ bool FGOutput::Load(Element* element)
   Element *property_element;
 
   string separator = "/";
-# ifdef macintosh
-  separator = ";";
-# endif
 
   if (!DirectivesFile.empty()) { // A directives filename from the command line overrides
     output_file_name = DirectivesFile;      // one found in the config file.

src/FDM/JSBSim/models/FGPropulsion.cpp

@@ -336,9 +336,6 @@ string FGPropulsion::FindEngineFullPathname(string engine_filename)
   ifstream engine_file;
 
   string separator = "/";
-# ifdef macintosh
-  separator = ";";
-# endif
 
   fullpath = enginePath + separator;
   localpath = aircraftPath + separator + "Engines" + separator;
@@ -367,9 +364,6 @@ ifstream* FGPropulsion::FindEngineFile(string engine_filename)
   ifstream* engine_file = new ifstream();
 
   string separator = "/";
-# ifdef macintosh
-  separator = ";";
-# endif
 
   fullpath = enginePath + separator;
   localpath = aircraftPath + separator + "Engines" + separator;

src/FDM/JSBSim/models/propulsion/FGEngine.cpp

@@ -254,10 +254,6 @@ bool FGEngine::LoadThruster(Element *thruster_element)
   FGColumnVector3 location, orientation;
   string separator = "/";
 
-# ifdef macintosh
-    separator = ";";
-# endif
-
   fullpath = enginePath + separator;
   localpath = aircraftPath + separator + "Engines" + separator;
 

src/FDM/UIUCModel/uiuc_menu.cpp

@@ -159,11 +159,6 @@
 
 #include <simgear/compiler.h>
 
-#if defined( __MWERKS__ )
-// -dw- optimizer chokes (big-time) trying to optimize humongous
-// loop/switch statements
-#pragma optimization_level 0
-#endif
 
 #include <cstdlib>
 #include <string>

src/FDM/UIUCModel/uiuc_menu_CD.cpp

@@ -72,11 +72,6 @@
 
 #include <simgear/compiler.h>
 
-#if defined( __MWERKS__ )
-// -dw- optimizer chokes (big-time) trying to optimize humongous
-// loop/switch statements
-#pragma optimization_level 0
-#endif
 
 #include <cstdlib>
 #include <string>

src/FDM/UIUCModel/uiuc_menu_CL.cpp

@@ -72,11 +72,6 @@
 
 #include <simgear/compiler.h>
 
-#if defined( __MWERKS__ )
-// -dw- optimizer chokes (big-time) trying to optimize humongous
-// loop/switch statements
-#pragma optimization_level 0
-#endif
 
 #include <cstdlib>
 #include <string>

src/FDM/UIUCModel/uiuc_menu_CY.cpp

@@ -72,11 +72,6 @@
 
 #include <simgear/compiler.h>
 
-#if defined( __MWERKS__ )
-// -dw- optimizer chokes (big-time) trying to optimize humongous
-// loop/switch statements
-#pragma optimization_level 0
-#endif
 
 #include <cstdlib>
 #include <string>

src/FDM/UIUCModel/uiuc_menu_Cm.cpp

@@ -72,11 +72,6 @@
 
 #include <simgear/compiler.h>
 
-#if defined( __MWERKS__ )
-// -dw- optimizer chokes (big-time) trying to optimize humongous
-// loop/switch statements
-#pragma optimization_level 0
-#endif
 
 #include <cstdlib>
 #include <string>

src/FDM/UIUCModel/uiuc_menu_Cn.cpp

@@ -72,11 +72,6 @@
 
 #include <simgear/compiler.h>
 
-#if defined( __MWERKS__ )
-// -dw- optimizer chokes (big-time) trying to optimize humongous
-// loop/switch statements
-#pragma optimization_level 0
-#endif
 
 #include <cstdlib>
 #include <string>

src/FDM/UIUCModel/uiuc_menu_Croll.cpp

@@ -72,11 +72,6 @@
 
 #include <simgear/compiler.h>
 
-#if defined( __MWERKS__ )
-// -dw- optimizer chokes (big-time) trying to optimize humongous
-// loop/switch statements
-#pragma optimization_level 0
-#endif
 
 #include <cstdlib>
 #include <string>

src/FDM/UIUCModel/uiuc_menu_controlSurface.cpp

@@ -72,11 +72,6 @@
 
 #include <simgear/compiler.h>
 
-#if defined( __MWERKS__ )
-// -dw- optimizer chokes (big-time) trying to optimize humongous
-// loop/switch statements
-#pragma optimization_level 0
-#endif
 
 #include <cstdlib>
 #include <string>

src/FDM/UIUCModel/uiuc_menu_engine.cpp

@@ -72,11 +72,6 @@
 
 #include <simgear/compiler.h>
 
-#if defined( __MWERKS__ )
-// -dw- optimizer chokes (big-time) trying to optimize humongous
-// loop/switch statements
-#pragma optimization_level 0
-#endif
 
 #include <cstdlib>
 #include <string>

src/FDM/UIUCModel/uiuc_menu_fog.cpp

@@ -72,11 +72,6 @@
 
 #include <simgear/compiler.h>
 
-#if defined( __MWERKS__ )
-// -dw- optimizer chokes (big-time) trying to optimize humongous
-// loop/switch statements
-#pragma optimization_level 0
-#endif
 
 #include <cstdlib>
 #include <string>

src/FDM/UIUCModel/uiuc_menu_gear.cpp

@@ -72,11 +72,6 @@
 
 #include <simgear/compiler.h>
 
-#if defined( __MWERKS__ )
-// -dw- optimizer chokes (big-time) trying to optimize humongous
-// loop/switch statements
-#pragma optimization_level 0
-#endif
 
 #include <cstdlib>
 #include <string>

src/FDM/UIUCModel/uiuc_menu_geometry.cpp

@@ -72,11 +72,6 @@
 
 #include <simgear/compiler.h>
 
-#if defined( __MWERKS__ )
-// -dw- optimizer chokes (big-time) trying to optimize humongous
-// loop/switch statements
-#pragma optimization_level 0
-#endif
 
 #include <cstdlib>
 #include <string>

src/FDM/UIUCModel/uiuc_menu_ice.cpp

@@ -72,11 +72,6 @@
 
 #include <simgear/compiler.h>
 
-#if defined( __MWERKS__ )
-// -dw- optimizer chokes (big-time) trying to optimize humongous
-// loop/switch statements
-#pragma optimization_level 0
-#endif
 
 #include <cstdlib>
 #include <string>

src/FDM/UIUCModel/uiuc_menu_init.cpp

@@ -73,11 +73,6 @@
 
 #include <simgear/compiler.h>
 
-#if defined( __MWERKS__ )
-// -dw- optimizer chokes (big-time) trying to optimize humongous
-// loop/switch statements
-#pragma optimization_level 0
-#endif
 
 #include <cstdlib>
 #include <string>

src/FDM/UIUCModel/uiuc_menu_mass.cpp

@@ -72,11 +72,6 @@
 
 #include <simgear/compiler.h>
 
-#if defined( __MWERKS__ )
-// -dw- optimizer chokes (big-time) trying to optimize humongous
-// loop/switch statements
-#pragma optimization_level 0
-#endif
 
 #include <cstdlib>
 #include <string>

src/FDM/UIUCModel/uiuc_menu_misc.cpp

@@ -72,11 +72,6 @@
 
 #include <simgear/compiler.h>
 
-#if defined( __MWERKS__ )
-// -dw- optimizer chokes (big-time) trying to optimize humongous
-// loop/switch statements
-#pragma optimization_level 0
-#endif
 
 #include <cstdlib>
 #include <string>

src/FDM/UIUCModel/uiuc_menu_record.cpp

@@ -75,11 +75,6 @@
 
 #include <simgear/compiler.h>
 
-#if defined( __MWERKS__ )
-// -dw- optimizer chokes (big-time) trying to optimize humongous
-// loop/switch statements
-#pragma optimization_level 0
-#endif
 
 #include <cstdlib>
 #include <string>