Updated to match changes in radiostack.[ch]xx

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

diff --git a/src/FDM/JSBSim/FGfdmSocket.h b/src/FDM/JSBSim/FGfdmSocket.h
index f40429e83fce7e401147bfcd6dd60bb956af0a6a..df9c3ec7b6ef9c7dec7e0cea3f83594a42e917f2 100644 (file)
--- a/src/FDM/JSBSim/FGfdmSocket.h
+++ b/src/FDM/JSBSim/FGfdmSocket.h
@@ -45,25 +45,31 @@ INCLUDES
 #include <stdio.h>
 
 #ifdef FGFS
-#  pragma message("FGFS defined")
 #  include <simgear/compiler.h>
-#  ifdef SG_HAVE_STD_INCLUDES
-#    include <iostream>
-#    include <fstream>
-#  else
+#  include STL_STRING
+#  include STL_IOSTREAM
+#  include STL_FSTREAM
+#  if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
+     SG_USING_STD(cout);
+     SG_USING_STD(endl);
+#  endif
+#else
+#  include <string>
+#  if defined(sgi) && !defined(__GNUC__)
 #    include <iostream.h>
 #    include <fstream.h>
+#  else
+#    include <iostream>
+#    include <fstream>
+     using std::cout;
+     using std::endl;
 #  endif
-#else
-#  pragma message("FGFS not defined")
-#  include <iostream>
-#  include <fstream>
 #endif
 
-#include <string>
 #include <sys/types.h>
+#include "FGJSBBase.h"
 
-#if defined(__BORLANDC__) || defined(_MSC_VER)
+#if defined(__BORLANDC__) || defined(_MSC_VER) || defined(__MINGW32__)
   #include <winsock.h>
 #else
   #include <sys/socket.h>
@@ -76,10 +82,7 @@ INCLUDES
 DEFINITIONS
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#define ID_FDMSOCKET "$Header"
-
-using std::cout;
-using std::endl;
+#define ID_FDMSOCKET "$Id$"
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 CLASS DECLARATION
@@ -87,15 +90,17 @@ CLASS DECLARATION
 
 using std::string;
 
-class FGfdmSocket {
+class FGfdmSocket : public FGJSBBase
+{
 public:
   FGfdmSocket(string, int);
-  ~FGfdmSocket(void);
+  ~FGfdmSocket();
   void Send(void);
   void Append(const char*);
-  void Append(float);
+  void Append(double);
   void Append(long);
   void Clear(void);
+  bool GetConnectStatus(void) {return connected;}
 
 private:
   int sckt;
@@ -103,6 +108,8 @@ private:
   struct sockaddr_in scktName;
   struct hostent *host;
   string buffer;
+  bool connected;
+  void Debug(int from);
 };
 
 #endif