From 0fe7c2452cb819d6362f9b26776d83f5f560f024 Mon Sep 17 00:00:00 2001
From: ehofman <ehofman>
Date: Sun, 23 Mar 2003 10:08:47 +0000
Subject: [PATCH] MultiPlayer updates for MSVC from Frederic Bouvier

---
 src/MultiPlayer/mpplayer.cxx       | 12 +++++++-----
 src/MultiPlayer/multiplayrxmgr.cxx |  8 +++++---
 src/MultiPlayer/multiplaytxmgr.cxx |  8 +++++---
 src/Network/multiplay.cxx          |  2 +-
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/MultiPlayer/mpplayer.cxx b/src/MultiPlayer/mpplayer.cxx
index 40ba5c5f9..cc6411f54 100644
--- a/src/MultiPlayer/mpplayer.cxx
+++ b/src/MultiPlayer/mpplayer.cxx
@@ -38,10 +38,12 @@
 #include "mpplayer.hxx"
 
 #include <stdlib.h>
-#include <netdb.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
+#ifndef _MSC_VER
+# include <netdb.h>
+# include <sys/socket.h>
+# include <netinet/in.h>
+# include <arpa/inet.h>
+#endif
 #include <plib/netSocket.h>
 
 #include <Main/globals.hxx>
@@ -281,7 +283,7 @@ void MPPlayer::FillMsgHdr(T_MsgHdr *MsgHdr, const int iMsgId) {
             break;
     }
 
-    inet_aton(m_PlayerAddress.getHost(), &address);
+    address.s_addr = inet_addr( m_PlayerAddress.getHost() );
     MsgHdr->lReplyAddress = address.s_addr;
 
     MsgHdr->iReplyPort = m_PlayerAddress.getPort();
diff --git a/src/MultiPlayer/multiplayrxmgr.cxx b/src/MultiPlayer/multiplayrxmgr.cxx
index 61ca69514..89b6e832c 100644
--- a/src/MultiPlayer/multiplayrxmgr.cxx
+++ b/src/MultiPlayer/multiplayrxmgr.cxx
@@ -51,9 +51,11 @@
 ******************************************************************/
 
 #include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
+#ifndef _MSC_VER
+# include <sys/socket.h>
+# include <netinet/in.h>
+# include <arpa/inet.h>
+#endif
 #include <plib/netSocket.h>
 #include <stdlib.h>
 
diff --git a/src/MultiPlayer/multiplaytxmgr.cxx b/src/MultiPlayer/multiplaytxmgr.cxx
index 0b4336b78..0955e29cd 100644
--- a/src/MultiPlayer/multiplaytxmgr.cxx
+++ b/src/MultiPlayer/multiplaytxmgr.cxx
@@ -31,9 +31,11 @@
 ******************************************************************/
 
 #include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
+#ifndef _MSC_VER
+# include <sys/socket.h>
+# include <netinet/in.h>
+# include <arpa/inet.h>
+#endif
 #include <plib/netSocket.h>
 #include <stdlib.h>
 
diff --git a/src/Network/multiplay.cxx b/src/Network/multiplay.cxx
index b32d92297..dfb6b6a15 100644
--- a/src/Network/multiplay.cxx
+++ b/src/Network/multiplay.cxx
@@ -25,7 +25,7 @@
 
 #include STL_STRING
 
-#include <iostream.h>
+#include <iostream>
 
 #include <simgear/debug/logstream.hxx>