From 3b0cf518bc715da36fe9320531861d22a9c6eb55 Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Tue, 21 Mar 2000 22:06:05 +0000
Subject: [PATCH] MSVC++ tweaks contributed by Christian Mayer.

---
 src/Cockpit/panel.hxx         |  6 +++---
 src/FDM/JSBSim/FGRotation.cpp |  2 +-
 src/FDM/JSBSim/FGUtility.cpp  |  4 +++-
 src/GUI/gui.cxx               |  6 +++---
 src/Network/fg_file.hxx       |  4 +++-
 src/Network/fg_serial.cxx     |  2 +-
 src/Network/fg_socket.cxx     | 36 +++++++++++++++++++++--------------
 7 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/src/Cockpit/panel.hxx b/src/Cockpit/panel.hxx
index 79a2bee54..f0f0ace82 100644
--- a/src/Cockpit/panel.hxx
+++ b/src/Cockpit/panel.hxx
@@ -38,11 +38,11 @@
 #include <plib/ssg.h>
 
 #include <vector>
-#include <hash_map>
+#include <map>
 #include <plib/fnt.h>
 
 FG_USING_STD(vector);
-FG_USING_STD(hash_map);
+FG_USING_STD(map);
 
 class FGPanelInstrument;
 
@@ -76,7 +76,7 @@ private:
   ssgTexture * _bg;
 
 				// Internalization table.
-  hash_map<const char *,ssgTexture *> _textureMap;
+  map<const char *,ssgTexture *> _textureMap;
 
 				// List of instruments in panel.
   instrument_list_type _instruments;
diff --git a/src/FDM/JSBSim/FGRotation.cpp b/src/FDM/JSBSim/FGRotation.cpp
index 43712681c..4385e13aa 100644
--- a/src/FDM/JSBSim/FGRotation.cpp
+++ b/src/FDM/JSBSim/FGRotation.cpp
@@ -68,7 +68,7 @@ INCLUDES
 
 #ifndef M_PI
 /* get a definition for pi */
-#include <Include/fg_constants.h>
+#include <simgear/constants.h>
 #define M_PI FG_PI
 #endif
 
diff --git a/src/FDM/JSBSim/FGUtility.cpp b/src/FDM/JSBSim/FGUtility.cpp
index 6a5225aab..9ed89e70f 100644
--- a/src/FDM/JSBSim/FGUtility.cpp
+++ b/src/FDM/JSBSim/FGUtility.cpp
@@ -59,7 +59,7 @@ INCLUDES
 
 #ifndef M_PI_2
 /* get a definition for pi */
-#include <Include/fg_constants.h>
+#include <simgear/constants.h>
 #define M_PI_2 FG_PI_2
 #endif
 
@@ -82,10 +82,12 @@ FGUtility::~FGUtility()
 
 float FGUtility::ToGeodetic()
 {
+    return 0.0;
 }
 
 
 float FGUtility:: FromGeodetic()
 {
+    return 0.0;
 }
 
diff --git a/src/GUI/gui.cxx b/src/GUI/gui.cxx
index 44c634fda..7a8a71b94 100644
--- a/src/GUI/gui.cxx
+++ b/src/GUI/gui.cxx
@@ -70,8 +70,8 @@
 #include <Time/fg_time.hxx>
 
 #if defined( WIN32 ) && !defined( __CYGWIN__ )
-#  include <Screen/win32-printer.h>
-#  include <Screen/GlBitmaps.h>
+#  include <simgear/screen/win32-printer.h>
+#  include <simgear/screen/GlBitmaps.h>
 #endif
 
 /*
@@ -864,7 +864,7 @@ static void rotateView( double roll, double pitch, double yaw )
 	// rotate view
 }
 
-static GLBitmap *b1 = NULL;
+static GlBitmap *b1 = NULL;
 extern FGInterface cur_view_fdm;
 GLubyte *hiResScreenCapture( int multiplier )
 {
diff --git a/src/Network/fg_file.hxx b/src/Network/fg_file.hxx
index f7409948b..4029825a5 100644
--- a/src/Network/fg_file.hxx
+++ b/src/Network/fg_file.hxx
@@ -36,7 +36,9 @@
 #include <sys/types.h>		// for open(), read(), write(), close()
 #include <sys/stat.h>		// for open(), read(), write(), close()
 #include <fcntl.h>		// for open(), read(), write(), close()
-#include <unistd.h>		// for open(), read(), write(), close()
+#if !defined( _MSC_VER )
+#  include <unistd.h>		// for open(), read(), write(), close()
+#endif
 
 #include "iochannel.hxx"
 #include "protocol.hxx"
diff --git a/src/Network/fg_serial.cxx b/src/Network/fg_serial.cxx
index 78c1817a5..e1897b59c 100644
--- a/src/Network/fg_serial.cxx
+++ b/src/Network/fg_serial.cxx
@@ -113,7 +113,7 @@ int FGSerial::readline( char *buf, int length ) {
     // copy to external buffer
     strncpy( buf, save_buf, result );
     buf[result] = '\0';
-    cout << "fg_serial line = " << buf << endl;
+    FG_LOG( FG_IO, FG_INFO, "fg_serial line = " << buf );
 
     // shift save buffer
     for ( i = result; i < save_len; ++i ) {
diff --git a/src/Network/fg_socket.cxx b/src/Network/fg_socket.cxx
index cbd50cf27..2252f0314 100644
--- a/src/Network/fg_socket.cxx
+++ b/src/Network/fg_socket.cxx
@@ -23,12 +23,20 @@
 
 #include <simgear/compiler.h>
 
-#include <sys/time.h>		// select()
-#include <sys/types.h>		// socket(), bind(), select(), accept()
-#include <sys/socket.h>		// socket(), bind(), listen(), accept()
-#include <netinet/in.h>		// struct sockaddr_in
-#include <netdb.h>		// gethostbyname()
-#include <unistd.h>		// select(), fsync()/fdatasync()
+#if ! defined( _MSC_VER )
+#  include <sys/time.h>		// select()
+#  include <sys/types.h>	// socket(), bind(), select(), accept()
+#  include <sys/socket.h>	// socket(), bind(), listen(), accept()
+#  include <netinet/in.h>	// struct sockaddr_in
+#  include <netdb.h>		// gethostbyname()
+#  include <unistd.h>		// select(), fsync()/fdatasync()
+#else
+#  include <sys/timeb.h>	// select()
+#  include <winsock2.h>		// socket(), bind(), listen(), accept(),
+				// struct sockaddr_in, gethostbyname()
+#  include <windows.h>
+#  include <io.h>
+#endif
 
 #if defined( sgi )
 #include <strings.h>
@@ -56,7 +64,7 @@ FGSocket::~FGSocket() {
 int FGSocket::make_server_socket () {
     struct sockaddr_in name;
 
-#if defined( __CYGWIN__ ) || defined( __CYGWIN32__ ) || defined( sgi )
+#if defined( __CYGWIN__ ) || defined( __CYGWIN32__ ) || defined( sgi ) || defined( _MSC_VER )
     int length;
 #else
     socklen_t length;
@@ -154,7 +162,7 @@ bool FGSocket::open( FGProtocol::fgProtocolDir dir ) {
 	// call.  A port of "0" indicates that we want to let the os
 	// pick any available port.
 	sock = make_server_socket();
-	cout << "socket is connected to port = " << port << endl;
+	FG_LOG( FG_IO, FG_INFO, "socket is connected to port = " << port );
 
 	// Specify the maximum length of the connection queue
 	listen(sock, FG_MAX_SOCKET_QUEUE);
@@ -231,9 +239,9 @@ int FGSocket::readline( char *buf, int length ) {
 	char *buf_ptr = save_buf + save_len;
 	result = std::read( sock, buf_ptr, FG_MAX_MSG_SIZE - save_len );
 	save_len += result;
-	cout << "current read = " << buf_ptr << endl;
-	cout << "current save_buf = " << save_buf << endl;
-	cout << "save_len = " << save_len << endl;
+	// cout << "current read = " << buf_ptr << endl;
+	// cout << "current save_buf = " << save_buf << endl;
+	// cout << "save_len = " << save_len << endl;
     }
 
     // look for the end of line in save_buf
@@ -243,17 +251,17 @@ int FGSocket::readline( char *buf, int length ) {
 	result = i + 1;
     } else {
 	// no end of line yet
-	cout << "no eol found" << endl;
+	// cout << "no eol found" << endl;
 	return 0;
     }
-    cout << "line length = " << result << endl;
+    // cout << "line length = " << result << endl;
 
     // we found an end of line
 
     // copy to external buffer
     strncpy( buf, save_buf, result );
     buf[result] = '\0';
-    cout << "fg_socket line = " << buf << endl;
+    // cout << "fg_socket line = " << buf << endl;
     
     // shift save buffer
     for ( i = result; i < save_len; ++i ) {