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

@@ -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>

common/dbcore.h

@@ -2,7 +2,7 @@
 #define DBCORE_H
 
 #ifdef _WINDOWS
-	#include <winsock.h>
+	#include <winsock2.h>
 	#include <windows.h>
 #endif
 

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>

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>

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
 

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
 

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>

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

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

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

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

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>

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