pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-04 15:12:26 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix inclusion of windows.h breaking things with its defines

Browse Source
This commit is contained in:
brainiac 2026-04-03 01:49:20 -07:00
parent d58bc01755
commit 29034e14fe
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/cli/terminal_color.hpp
View File

@ -51,7 +51,7 @@
# include <unistd.h> # include <unistd.h>
#elif defined(TERMCOLOR_OS_WINDOWS) #elif defined(TERMCOLOR_OS_WINDOWS)
# include <io.h> # include <io.h>
# include <windows.h> # include "common/platform/win/include_windows.h"
#endif #endif

1
common/dbcore.h
View File

@ -21,6 +21,7 @@
#include "common/types.h" #include "common/types.h"
#include "mysql.h" #include "mysql.h"
#include <memory>
#include <mutex> #include <mutex>
#define CR_SERVER_GONE_ERROR 2006 #define CR_SERVER_GONE_ERROR 2006

4
common/eqemu_logsys.cpp
View File

@ -33,10 +33,8 @@
#include <sys/stat.h> #include <sys/stat.h>
#ifdef _WINDOWS #ifdef _WINDOWS
#include <conio.h> #include "common/platform/platform.h"
#include <direct.h> #include <direct.h>
#include <process.h>
#include <windows.h>
#else #else
#include <sys/stat.h> #include <sys/stat.h>
#include <thread> #include <thread>

2
common/net/tcp_connection.h
View File

@ -19,7 +19,9 @@
#include "common/net/tcp_connection_pooling.h" #include "common/net/tcp_connection_pooling.h"
#include "common/platform/platform.h"
#include "uv.h" #include "uv.h"
#include <functional> #include <functional>
#include <memory> #include <memory>
#include <string> #include <string>

1
common/platform/win/include_winsock2.h
View File

@ -19,6 +19,7 @@
#ifdef _WINDOWS #ifdef _WINDOWS
#include "common/platform/win/include_windows.h"
#include <WinSock2.h> #include <WinSock2.h>
#endif // _WINDOWS #endif // _WINDOWS