FG_HAVE_STD_INCLUDES -> SG_HAVE_STD_INCLUDES

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

diff --git a/src/FDM/JSBSim/FGfdmSocket.cpp b/src/FDM/JSBSim/FGfdmSocket.cpp
index e3b4c053a186207f30217c4a59176cee3097a93d..19be402a7604ece6acbb4c424ca05e9ed383c397 100644 (file)
--- a/src/FDM/JSBSim/FGfdmSocket.cpp
+++ b/src/FDM/JSBSim/FGfdmSocket.cpp
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
  Module:       FGfdmSocket.cpp
  Author:       Jon S. Berndt
@@ -33,21 +33,24 @@ HISTORY
 --------------------------------------------------------------------------------
 11/08/99   JSB   Created
 
-********************************************************************************
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 INCLUDES
-*******************************************************************************/
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
 #include "FGfdmSocket.h"
 
-/*******************************************************************************
-************************************ CODE **************************************
-*******************************************************************************/
+static const char *IdSrc = "$Header$";
+static const char *IdHdr = ID_FDMSOCKET;
+
+/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+CLASS IMPLEMENTATION
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
 FGfdmSocket::FGfdmSocket(string address, int port)
 {
   size = 0;
 
-  #ifdef __BORLANDC__ || _MSC_VER
+  #if defined(__BORLANDC__) || defined(_MSC_VER)
     WSADATA wsaData;
     int PASCAL FAR wsaReturnCode;
     wsaReturnCode = WSAStartup(MAKEWORD(1,1), &wsaData);
@@ -88,7 +91,10 @@ FGfdmSocket::FGfdmSocket(string address, int port)
 
 FGfdmSocket::~FGfdmSocket(void)
 {
+  #ifndef macintosh
   if (sckt) shutdown(sckt,2);
+  #endif
+  
   #ifdef __BORLANDC__
     WSACleanup();
   #endif
@@ -131,10 +137,8 @@ void FGfdmSocket::Append(long item)
 
 void FGfdmSocket::Send(void)
 {
-  int len;
-  
   buffer += string("\n");
-  if ((len = send(sckt,buffer.c_str(),buffer.size(),0)) <= 0) {
+  if ((send(sckt,buffer.c_str(),buffer.size(),0)) <= 0) {
     perror("send");
   } else {
   }