From c48667fae9c6d881bdc072ca54f78716f40f0a22 Mon Sep 17 00:00:00 2001
From: kervala <devnull@localhost>
Date: Thu, 24 May 2012 12:56:53 +0200
Subject: [PATCH] Fixed: #1474 Compilation with new MySQL headers

---
 code/ryzom/server/src/monitor_service/service_main.cpp | 2 +-
 code/ryzom/server/src/server_share/mysql_wrapper.h     | 2 +-
 2 files changed, 2 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 d7cdfb6d8..5ca88641e 100644
--- a/code/ryzom/server/src/monitor_service/service_main.cpp
+++ b/code/ryzom/server/src/monitor_service/service_main.cpp
@@ -31,9 +31,9 @@
 #	define NOMINMAX
 #	include <WinSock2.h>
 #	include <Windows.h>
+typedef unsigned long ulong;
 #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 59c1d76a7..2bc2489cf 100644
--- a/code/ryzom/server/src/server_share/mysql_wrapper.h
+++ b/code/ryzom/server/src/server_share/mysql_wrapper.h
@@ -28,9 +28,9 @@
 #ifdef NL_OS_WINDOWS
 # include <WinSock2.h>
 # include <Windows.h>
+typedef unsigned long ulong;
 #endif
 
-#include <my_global.h>
 #include <mysql.h>
 #include <time.h>