pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-11 16:51:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix more windows.h/winsock.h/winsock2.h issues

Browse Source 
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
This commit is contained in:
Michael Cook (mackal) 2016-05-25 13:46:47 -04:00
parent a9ef83c597
commit c43d436b1f
13 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/base_packet.h
View File

@ -22,10 +22,10 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#ifdef WIN32 #ifdef _WINDOWS
#include <time.h> #include <time.h>
#include <windows.h>
#include <winsock2.h> #include <winsock2.h>
#include <windows.h>
#else #else
#include <sys/time.h> #include <sys/time.h>
#include <netinet/in.h> #include <netinet/in.h>

2
common/dbcore.h
View File

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

2
common/eq_stream_factory.cpp
View File

@ -3,7 +3,7 @@
#include "eq_stream_factory.h" #include "eq_stream_factory.h"
#ifdef _WINDOWS #ifdef _WINDOWS
#include <winsock.h> #include <winsock2.h>
#include <process.h> #include <process.h>
#include <io.h> #include <io.h>
#include <stdio.h> #include <stdio.h>

2
common/mutex.h
View File

@ -18,7 +18,7 @@
#ifndef MYMUTEX_H #ifndef MYMUTEX_H
#define MYMUTEX_H #define MYMUTEX_H
#ifdef _WINDOWS #ifdef _WINDOWS
#include <winsock.h> #include <winsock2.h>
#include <windows.h> #include <windows.h>
#else #else
#include <pthread.h> #include <pthread.h>

2
common/mysql_request_result.h
View File

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

2
common/mysql_request_row.h
View File

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

2
common/ptimer.cpp
View File

@ -24,8 +24,8 @@
#include "string_util.h" #include "string_util.h"
#ifdef _WINDOWS #ifdef _WINDOWS
#include <winsock2.h>
#include <windows.h> #include <windows.h>
#include <winsock.h>
int gettimeofday (timeval *tp, ...); int gettimeofday (timeval *tp, ...);
#else #else
#include <sys/time.h> #include <sys/time.h>

2
world/client.cpp
View File

@ -61,8 +61,8 @@
// Disgrace: for windows compile // Disgrace: for windows compile
#ifdef _WINDOWS #ifdef _WINDOWS
#include <winsock2.h>
#include <windows.h> #include <windows.h>
#include <winsock.h>
#else #else
#ifdef FREEBSD //Timothy Whitman - January 7, 2003 #ifdef FREEBSD //Timothy Whitman - January 7, 2003

2
world/login_server.cpp
View File

@ -25,8 +25,8 @@
#ifdef _WINDOWS #ifdef _WINDOWS
#include <process.h> #include <process.h>
#include <winsock2.h>
#include <windows.h> #include <windows.h>
#include <winsock.h>
#define snprintf _snprintf #define snprintf _snprintf
#define strncasecmp _strnicmp #define strncasecmp _strnicmp

2
world/net.h
View File

@ -26,8 +26,8 @@
#else #else
#include <cerrno> #include <cerrno>
#include <fcntl.h> #include <fcntl.h>
#include <winsock2.h>
#include <windows.h> #include <windows.h>
#include <winsock.h>
#endif #endif
void CatchSignal(int sig_num); void CatchSignal(int sig_num);

2
zone/client_process.cpp
View File

@ -26,8 +26,8 @@
#include <zlib.h> #include <zlib.h>
#ifdef _WINDOWS #ifdef _WINDOWS
#include <winsock2.h>
#include <windows.h> #include <windows.h>
#include <winsock.h>
#define snprintf _snprintf #define snprintf _snprintf
#define strncasecmp _strnicmp #define strncasecmp _strnicmp
#define strcasecmp _stricmp #define strcasecmp _stricmp

2
zone/net.h
View File

@ -16,8 +16,8 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#ifdef _WINDOWS #ifdef _WINDOWS
#include <winsock2.h>
#include <windows.h> #include <windows.h>
#include <winsock.h>
#else #else
#include <sys/socket.h> #include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>

2
zone/tribute.cpp
View File

@ -25,8 +25,8 @@
#include <map> #include <map>
#ifdef _WINDOWS #ifdef _WINDOWS
#include <winsock2.h>
#include <windows.h> #include <windows.h>
#include <winsock.h>
#include <process.h> #include <process.h>
#define snprintf _snprintf #define snprintf _snprintf
#define vsnprintf _vsnprintf #define vsnprintf _vsnprintf