"make dist" fixes.

[flightgear.git] / src / FDM / JSBSim / FGFDMExec.cpp

diff --git a/src/FDM/JSBSim/FGFDMExec.cpp b/src/FDM/JSBSim/FGFDMExec.cpp
index 5ed9ce5310a7561651d88f7b51b1935585db0754..2d5d409faf8006bb3470007cde5118a7cd5dc9fd 100644 (file)
--- a/src/FDM/JSBSim/FGFDMExec.cpp
+++ b/src/FDM/JSBSim/FGFDMExec.cpp
@@ -41,19 +41,6 @@ COMMENTS, REFERENCES,  and NOTES
 INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#ifdef FGFS
-#  include <simgear/compiler.h>
-#  include STL_IOSTREAM
-#  include STL_ITERATOR
-#else
-#  if defined(sgi) && !defined(__GNUC__) && (_COMPILER_VERSION < 740)
-#    include <iostream.h>
-#  else
-#    include <iostream>
-#  endif
-#  include <iterator>
-#endif
-
 #include "FGFDMExec.h"
 #include "FGState.h"
 #include <models/FGAtmosphere.h>
@@ -77,6 +64,9 @@ INCLUDES
 #include <input_output/FGPropertyManager.h>
 #include <input_output/FGScript.h>
 
+#include <iostream>
+#include <iterator>
+
 namespace JSBSim {
 
 static const char *IdSrc = "$Id$";
@@ -489,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;