diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/database/Database/MySQLPreparedStatement.h | 1 | ||||
| -rw-r--r-- | src/server/database/Database/MySQLWorkaround.h | 5 | ||||
| -rw-r--r-- | src/server/database/PrecompiledHeaders/databasePCH.h | 13 |
3 files changed, 7 insertions, 12 deletions
diff --git a/src/server/database/Database/MySQLPreparedStatement.h b/src/server/database/Database/MySQLPreparedStatement.h index d03ce29c480..d348130097f 100644 --- a/src/server/database/Database/MySQLPreparedStatement.h +++ b/src/server/database/Database/MySQLPreparedStatement.h @@ -20,7 +20,6 @@ #include "DatabaseEnvFwd.h" #include "Define.h" -#include "MySQLWorkaround.h" #include <string> #include <vector> diff --git a/src/server/database/Database/MySQLWorkaround.h b/src/server/database/Database/MySQLWorkaround.h index 0b588bb9475..b9e15c260e8 100644 --- a/src/server/database/Database/MySQLWorkaround.h +++ b/src/server/database/Database/MySQLWorkaround.h @@ -15,7 +15,12 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ +#ifndef MySQLWorkaround_h__ +#define MySQLWorkaround_h__ + #ifdef _WIN32 // hack for broken mysql.h not including the correct winsock header for SOCKET definition, fixed in 5.7 #include <winsock2.h> #endif #include <mysql.h> + +#endif // MySQLWorkaround_h__ diff --git a/src/server/database/PrecompiledHeaders/databasePCH.h b/src/server/database/PrecompiledHeaders/databasePCH.h index 015b163e82b..d8c2af9bb0e 100644 --- a/src/server/database/PrecompiledHeaders/databasePCH.h +++ b/src/server/database/PrecompiledHeaders/databasePCH.h @@ -15,15 +15,6 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "Define.h" -#include "Errors.h" -#include "Field.h" +#include "DatabaseEnv.h" #include "Log.h" -#include "MySQLConnection.h" -#include "MySQLWorkaround.h" -#include "PreparedStatement.h" -#include "QueryResult.h" -#include "SQLOperation.h" -#include "Transaction.h" -#include <string> -#include <vector> +#include "MySQLHacks.h" |