From 6e1400091ebf24f5c1bc20a476c7a0fb88f28b31 Mon Sep 17 00:00:00 2001
From: kervala <devnull@localhost>
Date: Sun, 20 May 2012 00:05:01 +0200
Subject: [PATCH] Fixed: Compilation with new mysqlclient headers

---
 code/ryzom/server/src/monitor_service/service_main.cpp | 4 +++-
 code/ryzom/server/src/server_share/mysql_wrapper.h     | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/code/ryzom/server/src/monitor_service/service_main.cpp b/code/ryzom/server/src/monitor_service/service_main.cpp
index d4f3e8d56..d7cdfb6d8 100644
--- 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;
diff --git a/code/ryzom/server/src/server_share/mysql_wrapper.h b/code/ryzom/server/src/server_share/mysql_wrapper.h
index d2fbc09d6..59c1d76a7 100644
--- 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>