builddir -> srcdir so builds can be done outside the master source directory.

[flightgear.git] / src / FDM / JSBSim / FGfdmSocket.h

diff --git a/src/FDM/JSBSim/FGfdmSocket.h b/src/FDM/JSBSim/FGfdmSocket.h
index 5f611d093b53f10952f16761752606275d2f094d..52f2ffe426a31aa7cf67dfc23529e3917cc2e9bd 100644 (file)
--- a/src/FDM/JSBSim/FGfdmSocket.h
+++ b/src/FDM/JSBSim/FGfdmSocket.h
@@ -42,28 +42,25 @@ COMMENTS, REFERENCES,  and NOTES
 INCLUDES
 *******************************************************************************/
 
-#include <stdlib.h>
 #include <stdio.h>
 
 #ifdef FGFS
 #  pragma message("FGFS defined")
 #  include <simgear/compiler.h>
-#  include STL_STRING
 #  ifdef FG_HAVE_STD_INCLUDES
-#    include <fstream>
 #    include <iostream>
+#    include <fstream>
 #  else
-#    include <fstream.h>
 #    include <iostream.h>
+#    include <fstream.h>
 #  endif
-   FG_USING_STD(string);
 #else
 #  pragma message("FGFS not defined")
-#  include <string>
-#  include <fstream>
 #  include <iostream>
+#  include <fstream>
 #endif
 
+#include <string>
 #include <sys/types.h>
 
 #if defined(__BORLANDC__) || defined(_MSC_VER)
@@ -79,12 +76,14 @@ INCLUDES
 DEFINITIONS
 *******************************************************************************/
 
+using std::cout;
+using std::endl;
 
 /*******************************************************************************
 CLASS DECLARATION
 *******************************************************************************/
 
-using namespace std;
+using std::string;
 
 class FGfdmSocket {
 public: