Fixed: Compilation with new mysqlclient headers

13 years ago · 78bc0fb0d7
parent 4be2469c8b
commit 78bc0fb0d7
2 changed files with 7 additions and 2 deletions
--- a/code/ryzom/server/src/monitor_service/service_main.cpp
+++ b/code/ryzom/server/src/monitor_service/service_main.cpp
@ -29,9 +29,11 @@

 #ifdef NL_OS_WINDOWS
 #	define NOMINMAX
-#	include <windows.h>
+#	include <WinSock2.h>
+#	include <Windows.h>
 #endif // NL_OS_WINDOWS

+#include <my_global.h>
 #include <mysql.h>

 using namespace NLMISC;
--- a/code/ryzom/server/src/server_share/mysql_wrapper.h
+++ b/code/ryzom/server/src/server_share/mysql_wrapper.h
@ -26,8 +26,11 @@
 #include "nel/net/module_common.h"
 #include "game_share/utils.h"
 #ifdef NL_OS_WINDOWS
-# include <windows.h>
+# include <WinSock2.h>
+# include <Windows.h>
 #endif
+
+#include <my_global.h>
 #include <mysql.h>
 #include <time.h>