MultiPlayer updates for MSVC from Frederic Bouvier

diff --git a/src/MultiPlayer/mpplayer.cxx b/src/MultiPlayer/mpplayer.cxx
index 40ba5c5f98492a7401145321047bdff518314d09..cc6411f54e51527248568d14657c168608c26252 100644 (file)
--- 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 61ca69514c5da91c911deed778b52d6030d028e1..89b6e832cda6ecae36694b5d12a3721ee0ceb76d 100644 (file)
--- 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 0b4336b7864c937d2211ae6f903e3da691d30863..0955e29cdf5762fdfe145265b8303977ac039650 100644 (file)
--- 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 b32d92297cd0dabf70e34ce1663d3ebe2f39d4e1..dfb6b6a15e7869028508bcc6f36855ea43d4955a 100644 (file)
--- 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>