From c43d436b1f444b0e7e1f8488a25d1bd8ace98aa8 Mon Sep 17 00:00:00 2001
From: "Michael Cook (mackal)" <mcook@mackal.net>
Date: Wed, 25 May 2016 13:46:47 -0400
Subject: [PATCH] Fix more windows.h/winsock.h/winsock2.h issues

We want to use winsock2.h rather than winsock.h. This was mostly enforced
from the global_defines.h file, but I wanted to make it consistent.

Most of these includes can be removed since they're included via
global_defines.h, but someone on windows should clean that up
---
 common/base_packet.h          | 4 ++--
 common/dbcore.h               | 2 +-
 common/eq_stream_factory.cpp  | 2 +-
 common/mutex.h                | 2 +-
 common/mysql_request_result.h | 2 +-
 common/mysql_request_row.h    | 2 +-
 common/ptimer.cpp             | 2 +-
 world/client.cpp              | 2 +-
 world/login_server.cpp        | 2 +-
 world/net.h                   | 2 +-
 zone/client_process.cpp       | 2 +-
 zone/net.h                    | 2 +-
 zone/tribute.cpp              | 2 +-
 13 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/common/base_packet.h b/common/base_packet.h
index 16a527ade..bdd774aa2 100644
--- a/common/base_packet.h
+++ b/common/base_packet.h
@@ -22,10 +22,10 @@
 #include <stdio.h>
 #include <string.h>
 
-#ifdef WIN32
+#ifdef _WINDOWS
 	#include <time.h>
-	#include <windows.h>
 	#include <winsock2.h>
+	#include <windows.h>
 #else
 	#include <sys/time.h>
 	#include <netinet/in.h>
diff --git a/common/dbcore.h b/common/dbcore.h
index b23d58a9e..6fd09218e 100644
--- a/common/dbcore.h
+++ b/common/dbcore.h
@@ -2,7 +2,7 @@
 #define DBCORE_H
 
 #ifdef _WINDOWS
-	#include <winsock.h>
+	#include <winsock2.h>
 	#include <windows.h>
 #endif
 
diff --git a/common/eq_stream_factory.cpp b/common/eq_stream_factory.cpp
index ca5596410..bc435ef51 100644
--- a/common/eq_stream_factory.cpp
+++ b/common/eq_stream_factory.cpp
@@ -3,7 +3,7 @@
 #include "eq_stream_factory.h"
 
 #ifdef _WINDOWS
-	#include <winsock.h>
+	#include <winsock2.h>
 	#include <process.h>
 	#include <io.h>
 	#include <stdio.h>
diff --git a/common/mutex.h b/common/mutex.h
index b1a71c331..48f58bcac 100644
--- a/common/mutex.h
+++ b/common/mutex.h
@@ -18,7 +18,7 @@
 #ifndef MYMUTEX_H
 #define MYMUTEX_H
 #ifdef _WINDOWS
-	#include <winsock.h>
+	#include <winsock2.h>
 	#include <windows.h>
 #else
 	#include <pthread.h>
diff --git a/common/mysql_request_result.h b/common/mysql_request_result.h
index 2944f528b..e859c6984 100644
--- a/common/mysql_request_result.h
+++ b/common/mysql_request_result.h
@@ -2,7 +2,7 @@
 #define MYSQL_REQUEST_RESULT_H
 
 #ifdef _WINDOWS
-	#include <winsock.h>
+	#include <winsock2.h>
 	#include <windows.h>
 #endif
 
diff --git a/common/mysql_request_row.h b/common/mysql_request_row.h
index 06788025d..ddfbddee9 100644
--- a/common/mysql_request_row.h
+++ b/common/mysql_request_row.h
@@ -2,7 +2,7 @@
 #define MYSQL_REQUEST_ROW_H
 
 #ifdef _WINDOWS
-	#include <winsock.h>
+	#include <winsock2.h>
 	#include <windows.h>
 #endif
 
diff --git a/common/ptimer.cpp b/common/ptimer.cpp
index c7f7b9046..273ac54d0 100644
--- a/common/ptimer.cpp
+++ b/common/ptimer.cpp
@@ -24,8 +24,8 @@
 #include "string_util.h"
 
 #ifdef _WINDOWS
+	#include <winsock2.h>
 	#include <windows.h>
-	#include <winsock.h>
 	int gettimeofday (timeval *tp, ...);
 #else
 	#include <sys/time.h>
diff --git a/world/client.cpp b/world/client.cpp
index 696da355b..7065c79f5 100644
--- a/world/client.cpp
+++ b/world/client.cpp
@@ -61,8 +61,8 @@
 
 // Disgrace: for windows compile
 #ifdef _WINDOWS
+	#include <winsock2.h>
 	#include <windows.h>
-	#include <winsock.h>
 #else
 	
 	#ifdef FREEBSD //Timothy Whitman - January 7, 2003
diff --git a/world/login_server.cpp b/world/login_server.cpp
index 8b17d9bc2..b8c23d573 100644
--- a/world/login_server.cpp
+++ b/world/login_server.cpp
@@ -25,8 +25,8 @@
 
 #ifdef _WINDOWS
 	#include <process.h>
+	#include <winsock2.h>
 	#include <windows.h>
-	#include <winsock.h>
 
 	#define snprintf	_snprintf
 	#define strncasecmp	_strnicmp
diff --git a/world/net.h b/world/net.h
index b343c8d68..5af1ef96a 100644
--- a/world/net.h
+++ b/world/net.h
@@ -26,8 +26,8 @@
 #else
 	#include <cerrno>
 	#include <fcntl.h>
+	#include <winsock2.h>
 	#include <windows.h>
-	#include <winsock.h>
 #endif
 
 void CatchSignal(int sig_num);
diff --git a/zone/client_process.cpp b/zone/client_process.cpp
index 72dd478c8..e5fd2ec99 100644
--- a/zone/client_process.cpp
+++ b/zone/client_process.cpp
@@ -26,8 +26,8 @@
 #include <zlib.h>
 
 #ifdef _WINDOWS
+	#include <winsock2.h>
 	#include <windows.h>
-	#include <winsock.h>
 	#define snprintf	_snprintf
 	#define strncasecmp	_strnicmp
 	#define strcasecmp	_stricmp
diff --git a/zone/net.h b/zone/net.h
index 8908a3740..4d44b6058 100644
--- a/zone/net.h
+++ b/zone/net.h
@@ -16,8 +16,8 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 #ifdef _WINDOWS
+	#include <winsock2.h>
 	#include <windows.h>
-	#include <winsock.h>
 #else
 	#include <sys/socket.h>
 	#include <netinet/in.h>
diff --git a/zone/tribute.cpp b/zone/tribute.cpp
index 737b04151..d40dfa6f2 100644
--- a/zone/tribute.cpp
+++ b/zone/tribute.cpp
@@ -25,8 +25,8 @@
 #include <map>
 
 #ifdef _WINDOWS
+    #include <winsock2.h>
     #include <windows.h>
-    #include <winsock.h>
     #include <process.h>
     #define snprintf	_snprintf
 	#define vsnprintf	_vsnprintf