Fixes for boost 1.35.0 with msvc - mainly winsock vs. winsock2 related.

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>

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>

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>

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>

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>

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>

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>

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);