From 2e38f58e1368647ac2e8153bbe4ab9cc9b7dd509 Mon Sep 17 00:00:00 2001
From: lotodore <pokerth@lotharmay.de>
Date: Wed, 16 Apr 2008 20:38:11 +0000
Subject: [PATCH] Fixes for boost 1.35.0 with msvc - mainly winsock vs.
 winsock2 related.

---
 src/core/avatarmanager.h              |  2 +-
 src/net/common/clientthread.cpp       |  1 +
 src/net/common/ircthread.cpp          |  3 +--
 src/net/common/resolverthread.cpp     |  1 +
 src/net/common/senderthread.cpp       |  2 +-
 src/net/common/serveracceptthread.cpp |  2 +-
 src/net/common/servermanager.cpp      |  2 +-
 src/net/netpacket.h                   |  2 +-
 src/net/win32/socket_helper.cpp       |  2 +-
 src/pokerth.cpp                       |  3 +--
 src/pokerth_server.cpp                |  5 ++---
 src/session.cpp                       |  1 +
 src/third_party/zlib/gun.c            | 12 +++++++++++-
 13 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/core/avatarmanager.h b/src/core/avatarmanager.h
index ea2e0afb..43a32ee4 100644
--- a/src/core/avatarmanager.h
+++ b/src/core/avatarmanager.h
@@ -21,8 +21,8 @@
 #ifndef _AVATARMANAGER_H_
 #define _AVATARMANAGER_H_
 
-#include <playerdata.h>
 #include <net/netpacket.h>
+#include <playerdata.h>
 #include <core/crypthelper.h>
 #include <ctime>
 #include <map>
diff --git a/src/net/common/clientthread.cpp b/src/net/common/clientthread.cpp
index 3c63d38a..6fe096cb 100644
--- a/src/net/common/clientthread.cpp
+++ b/src/net/common/clientthread.cpp
@@ -17,6 +17,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#include <net/socket_helper.h>
 #include <net/clientthread.h>
 #include <net/clientstate.h>
 #include <net/clientcontext.h>
diff --git a/src/net/common/ircthread.cpp b/src/net/common/ircthread.cpp
index d18a08ff..01a790b1 100644
--- a/src/net/common/ircthread.cpp
+++ b/src/net/common/ircthread.cpp
@@ -17,9 +17,8 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include <net/ircthread.h>
-
 #include <net/socket_helper.h>
+#include <net/ircthread.h>
 #include <net/socket_msg.h>
 #include <libircclient.h>
 #include <boost/algorithm/string/predicate.hpp>
diff --git a/src/net/common/resolverthread.cpp b/src/net/common/resolverthread.cpp
index 5501e1e0..f9ea8c90 100644
--- a/src/net/common/resolverthread.cpp
+++ b/src/net/common/resolverthread.cpp
@@ -17,6 +17,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#include <net/socket_helper.h>
 #include <net/resolverthread.h>
 #include <net/clientcontext.h>
 #include <net/clientexception.h>
diff --git a/src/net/common/senderthread.cpp b/src/net/common/senderthread.cpp
index 652b739a..42b9993e 100644
--- a/src/net/common/senderthread.cpp
+++ b/src/net/common/senderthread.cpp
@@ -17,10 +17,10 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#include <net/socket_helper.h>
 #include <net/senderthread.h>
 #include <net/sendercallback.h>
 #include <net/socket_msg.h>
-#include <net/socket_helper.h>
 #include <core/loghelper.h>
 #include <cstring>
 #include <cassert>
diff --git a/src/net/common/serveracceptthread.cpp b/src/net/common/serveracceptthread.cpp
index 7e65955c..a19999a6 100644
--- a/src/net/common/serveracceptthread.cpp
+++ b/src/net/common/serveracceptthread.cpp
@@ -17,12 +17,12 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#include <net/socket_helper.h>
 #include <net/serveracceptthread.h>
 #include <net/servercontext.h>
 #include <net/ircthread.h>
 #include <net/connectdata.h>
 #include <net/serverlobbythread.h>
-#include <net/socket_helper.h>
 #include <net/serverexception.h>
 #include <net/socket_msg.h>
 #include <net/socket_startup.h>
diff --git a/src/net/common/servermanager.cpp b/src/net/common/servermanager.cpp
index 9ceb358a..a3478acd 100644
--- a/src/net/common/servermanager.cpp
+++ b/src/net/common/servermanager.cpp
@@ -17,13 +17,13 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#include <net/socket_helper.h>
 #include <net/servermanager.h>
 #include <net/servercontext.h>
 #include <net/ircthread.h>
 #include <net/connectdata.h>
 #include <net/serverlobbythread.h>
 #include <net/serveracceptthread.h>
-#include <net/socket_helper.h>
 #include <net/serverexception.h>
 #include <net/socket_msg.h>
 #include <net/socket_startup.h>
diff --git a/src/net/netpacket.h b/src/net/netpacket.h
index c46dae7c..ea54662f 100644
--- a/src/net/netpacket.h
+++ b/src/net/netpacket.h
@@ -21,10 +21,10 @@
 #ifndef _NETPACKET_H_
 #define _NETPACKET_H_
 
+#include <net/socket_helper.h>
 #include <playerdata.h>
 #include <game_defs.h>
 #include <gamedata.h>
-#include <net/socket_helper.h>
 #include <core/crypthelper.h>
 
 #include <vector>
diff --git a/src/net/win32/socket_helper.cpp b/src/net/win32/socket_helper.cpp
index b517c20d..8a8c3bce 100644
--- a/src/net/win32/socket_helper.cpp
+++ b/src/net/win32/socket_helper.cpp
@@ -74,7 +74,7 @@ socket_string_to_addr(const char *str, int addrFamily, struct sockaddr * addr, i
 }
 
 bool
-socket_addr_to_string(struct sockaddr *addr, int addrLen, int addrFamily, char *str, int strLen)
+socket_addr_to_string(struct sockaddr *addr, int addrLen, int /*addrFamily*/, char *str, int strLen)
 {
 	bool retVal = false;
 	retVal = (WSAAddressToStringA(addr, addrLen, NULL, str, (DWORD *)&strLen) != SOCKET_ERROR);
diff --git a/src/pokerth.cpp b/src/pokerth.cpp
index c2a17740..a69d6bd8 100755
--- a/src/pokerth.cpp
+++ b/src/pokerth.cpp
@@ -18,8 +18,6 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include <iostream>
-
 /////// can be removed for non-qt-guis ////////////
 #include <qapplication.h>
 
@@ -37,6 +35,7 @@
 #include <QtGui>
 #include <QtCore>
 
+#include <iostream>
 #include <cstdlib>
 #include <ctime>
 
diff --git a/src/pokerth_server.cpp b/src/pokerth_server.cpp
index 6216f7bf..cc954e61 100644
--- a/src/pokerth_server.cpp
+++ b/src/pokerth_server.cpp
@@ -17,19 +17,18 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include <iostream>
-
+#include <net/netpacket.h>
 #include "session.h"
 #include "configfile.h"
 #include <qttoolsinterface.h>
 #include <gui/generic/serverguiwrapper.h>
 #include <net/socket_startup.h>
-#include <net/netpacket.h>
 #include <core/loghelper.h>
 #include <core/thread.h>
 #include <boost/program_options.hpp>
 #include <boost/filesystem.hpp>
 
+#include <iostream>
 #include <fstream>
 #include <memory>
 #include <csignal>
diff --git a/src/session.cpp b/src/session.cpp
index 137ba407..d4f2b8ea 100755
--- a/src/session.cpp
+++ b/src/session.cpp
@@ -17,6 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+#include <net/socket_helper.h>
 #include "session.h"
 #include "game.h"
 #include "guiinterface.h"
diff --git a/src/third_party/zlib/gun.c b/src/third_party/zlib/gun.c
index 78c331f6..414f4d8a 100644
--- a/src/third_party/zlib/gun.c
+++ b/src/third_party/zlib/gun.c
@@ -93,7 +93,12 @@
 #endif
 #include <sys/types.h>
 #include <sys/stat.h>       /* stat(), chmod() */
-#include <utime.h>          /* utime() */
+#ifdef _MSC_VER
+	#include <sys/utime.h>
+	#include <io.h>
+#else
+	#include <utime.h>          /* utime() */
+#endif
 #include "zlib.h"           /* inflateBackInit(), inflateBack(), */
                             /* inflateBackEnd(), crc32() */
 
@@ -101,6 +106,11 @@
 	#define stat _stat
 	#define utime _utime
 	#define utimbuf _utimbuf
+	#define write _write
+	#define read _read
+	#define open _open
+	#define close _close
+	#define unlink _unlink
 #endif
 
 /* function declaration */