From 3c027962ba861076932792c0714d3dbbb37c9c14 Mon Sep 17 00:00:00 2001
From: click <none@none>
Date: Thu, 26 Aug 2010 16:40:28 +0200
Subject: Buildsystem/Core: Adjust MySQL headers on relevant files to use
 simplified #include <mysql.h> instead of <mysql/mysql.h> + add support for
 compiling under MacOSX (thanks to elegos for the research) NOTE: G3D requires
 a redefinition-hack under OSX, please see wiki for this info (dep-sources
 will not be changed)

--HG--
branch : trunk
---
 src/server/shared/Database/MySQLConnection.cpp | 3 +++
 src/server/shared/Database/QueryResult.h       | 4 +---
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/server/shared/Database')

diff --git a/src/server/shared/Database/MySQLConnection.cpp b/src/server/shared/Database/MySQLConnection.cpp
index 9fe720bf1d1..ca06dca14c6 100644
--- a/src/server/shared/Database/MySQLConnection.cpp
+++ b/src/server/shared/Database/MySQLConnection.cpp
@@ -19,6 +19,9 @@
 
 #include "Common.h"
 
+#ifdef _WIN32
+  #include <winsock2.h>
+#endif
 #include <mysql.h>
 
 #include "DatabaseEnv.h"
diff --git a/src/server/shared/Database/QueryResult.h b/src/server/shared/Database/QueryResult.h
index d87551996f5..5dfb03a1a16 100755
--- a/src/server/shared/Database/QueryResult.h
+++ b/src/server/shared/Database/QueryResult.h
@@ -28,10 +28,8 @@
 
 #ifdef _WIN32
   #include <winsock2.h>
-  #include <mysql.h>
-#else
-  #include <mysql/mysql.h>
 #endif
+#include <mysql.h>
 
 class QueryResult
 {
-- 
cgit v1.2.3