diff options
| author | click <none@none> | 2010-08-26 16:40:28 +0200 |
|---|---|---|
| committer | click <none@none> | 2010-08-26 16:40:28 +0200 |
| commit | 3c027962ba861076932792c0714d3dbbb37c9c14 (patch) | |
| tree | 62c10ab82574d750f271fd73263de8ccc93d7587 /src/server/shared/Database | |
| parent | 692779f2830cc9c14eb07cb70908694b3c5ad75a (diff) | |
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
Diffstat (limited to 'src/server/shared/Database')
| -rw-r--r-- | src/server/shared/Database/MySQLConnection.cpp | 3 | ||||
| -rwxr-xr-x | src/server/shared/Database/QueryResult.h | 4 |
2 files changed, 4 insertions, 3 deletions
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 { |