diff options
| author | Spp <spp@jorge.gr> | 2012-11-09 13:13:45 +0100 |
|---|---|---|
| committer | Spp <spp@jorge.gr> | 2012-11-09 13:13:45 +0100 |
| commit | 333b8e5159ada2f1b8cbfd1dd8eb9072754477d7 (patch) | |
| tree | b73ed1ddf75c9cb691178f0fc409a5e86d3797ce /src/server/shared/Database | |
| parent | 90c95806a7bd54c8011e08ed74ff00198d206278 (diff) | |
Core/Build: Enable Clang PCH support and OS X specific features
Core: Fix warnings here and there
Diffstat (limited to 'src/server/shared/Database')
| -rwxr-xr-x | src/server/shared/Database/PreparedStatement.h | 6 | ||||
| -rwxr-xr-x | src/server/shared/Database/QueryResult.h | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/server/shared/Database/PreparedStatement.h b/src/server/shared/Database/PreparedStatement.h index 11ece3e3032..90ea435d1f9 100755 --- a/src/server/shared/Database/PreparedStatement.h +++ b/src/server/shared/Database/PreparedStatement.h @@ -21,6 +21,10 @@ #include "SQLOperation.h" #include <ace/Future.h> +#ifdef __APPLE__ +#undef TYPE_BOOL +#endif + //- Union for data buffer (upper-level bind -> queue -> lower-level bind) union PreparedStatementDataUnion { @@ -157,4 +161,4 @@ class PreparedStatementTask : public SQLOperation bool m_has_result; PreparedQueryResultFuture m_result; }; -#endif
\ No newline at end of file +#endif diff --git a/src/server/shared/Database/QueryResult.h b/src/server/shared/Database/QueryResult.h index e32b16555bc..be7fa7b649c 100755 --- a/src/server/shared/Database/QueryResult.h +++ b/src/server/shared/Database/QueryResult.h @@ -23,7 +23,6 @@ #include <ace/Thread_Mutex.h> #include "Field.h" -#include "Log.h" #ifdef _WIN32 #include <winsock2.h> |
