From 423e54d7ecd82d752b8fd7b1e3d763ec07f6df92 Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Fri, 26 Oct 2018 19:12:55 +0200
Subject: [PATCH] Fixing mysql includes

---
 deps/mysqlConnector/Connection.cpp        |  1 +
 deps/mysqlConnector/Connection.h          |  3 ++-
 deps/mysqlConnector/MySqlBase.cpp         |  1 +
 deps/mysqlConnector/MySqlBase.h           |  5 +++--
 deps/mysqlConnector/PreparedStatement.cpp |  1 +
 deps/mysqlConnector/PreparedStatement.h   |  3 ++-
 deps/mysqlConnector/ResultSet.cpp         |  1 +
 deps/mysqlConnector/ResultSet.h           |  5 ++++-
 deps/mysqlConnector/Statement.cpp         |  1 +
 deps/mysqlConnector/mysql_util.h          |  2 +-
 src/common/CMakeLists.txt                 |  2 +-
 src/common/Database/DbConnection.cpp      |  1 +
 src/common/Database/DbWorkerPool.cpp      |  1 +
 src/servers/sapphire_lobby/CMakeLists.txt |  4 ++--
 src/servers/sapphire_zone/ServerZone.cpp  | 25 ++++++++---------------
 15 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/deps/mysqlConnector/Connection.cpp b/deps/mysqlConnector/Connection.cpp
index 42c80478..64c05554 100644
--- a/deps/mysqlConnector/Connection.cpp
+++ b/deps/mysqlConnector/Connection.cpp
@@ -2,6 +2,7 @@
 #include "MySqlBase.h"
 #include "Statement.h"
 #include "PreparedStatement.h"
+#include <mysql.h>
 
 #include <vector>
 
diff --git a/deps/mysqlConnector/Connection.h b/deps/mysqlConnector/Connection.h
index c5442200..bcffc71a 100644
--- a/deps/mysqlConnector/Connection.h
+++ b/deps/mysqlConnector/Connection.h
@@ -2,9 +2,10 @@
 #define SAPPHIRE_CONNECTION_H
 
 #include <memory>
-#include <mysql.h>
 #include <map>
 
+typedef struct st_mysql MYSQL;
+enum mysql_option;
 
 namespace Mysql
 {
diff --git a/deps/mysqlConnector/MySqlBase.cpp b/deps/mysqlConnector/MySqlBase.cpp
index b7dd617f..e653c488 100644
--- a/deps/mysqlConnector/MySqlBase.cpp
+++ b/deps/mysqlConnector/MySqlBase.cpp
@@ -1,6 +1,7 @@
 #include "MySqlBase.h"
 #include "Connection.h"
 #include <memory>
+#include <mysql.h>
 
 Mysql::MySqlBase::MySqlBase() 
 {
diff --git a/deps/mysqlConnector/MySqlBase.h b/deps/mysqlConnector/MySqlBase.h
index 9c9cd92a..c44c9284 100644
--- a/deps/mysqlConnector/MySqlBase.h
+++ b/deps/mysqlConnector/MySqlBase.h
@@ -2,14 +2,15 @@
 #define SAPPHIRE_MYSQLBASE_H
 
 #include <memory>
-#include <mysql.h>
 #include <string>
 #include <map>
 
+enum mysql_option;
+
 namespace Mysql
 {
 
-using optionMap = std::map< enum mysql_option, std::string >;
+using optionMap = std::map< enum ::mysql_option, std::string >;
 
 class Connection;
 
diff --git a/deps/mysqlConnector/PreparedStatement.cpp b/deps/mysqlConnector/PreparedStatement.cpp
index 3338fdb7..5354fc02 100644
--- a/deps/mysqlConnector/PreparedStatement.cpp
+++ b/deps/mysqlConnector/PreparedStatement.cpp
@@ -5,6 +5,7 @@
 #include <variant>
 #include <errmsg.h>
 #include <string.h>
+#include <mysql.h>
 
 static const unsigned int MAX_SEND_LONGDATA_BUFFER = 1 << 18; //1<<18=256k (for istream)
 static const unsigned int MAX_SEND_LONGDATA_CHUNK =  1 << 18; //1<<19=512k (for string)
diff --git a/deps/mysqlConnector/PreparedStatement.h b/deps/mysqlConnector/PreparedStatement.h
index 0f46c74d..894005c4 100644
--- a/deps/mysqlConnector/PreparedStatement.h
+++ b/deps/mysqlConnector/PreparedStatement.h
@@ -3,7 +3,8 @@
 
 #include <memory>
 #include "Statement.h"
-#include <mysql.h>
+
+typedef struct st_mysql_stmt MYSQL_STMT;
 
 namespace Mysql
 {
diff --git a/deps/mysqlConnector/ResultSet.cpp b/deps/mysqlConnector/ResultSet.cpp
index 8a91d451..95c8375d 100644
--- a/deps/mysqlConnector/ResultSet.cpp
+++ b/deps/mysqlConnector/ResultSet.cpp
@@ -7,6 +7,7 @@
 #include <vector>
 #include <string.h>
 #include <algorithm>
+#include <mysql.h>
 
 Mysql::ResultSet::ResultSet( MYSQL_RES* res, std::shared_ptr< Mysql::Statement > par )
 {
diff --git a/deps/mysqlConnector/ResultSet.h b/deps/mysqlConnector/ResultSet.h
index 19646563..b68eda61 100644
--- a/deps/mysqlConnector/ResultSet.h
+++ b/deps/mysqlConnector/ResultSet.h
@@ -4,9 +4,12 @@
 #include <vector>
 
 #include "ResultSetBase.h"
-#include <mysql.h>
 #include <memory>
 
+typedef char **MYSQL_ROW;
+typedef struct st_mysql_res MYSQL_RES;
+typedef struct st_mysql_field MYSQL_FIELD;
+
 namespace Mysql
 {
       class Statement;
diff --git a/deps/mysqlConnector/Statement.cpp b/deps/mysqlConnector/Statement.cpp
index 056f2bef..543e5b1b 100644
--- a/deps/mysqlConnector/Statement.cpp
+++ b/deps/mysqlConnector/Statement.cpp
@@ -2,6 +2,7 @@
 #include "Connection.h"
 #include "ResultSet.h"
 #include "mysql_util.h"
+#include <mysql.h>
 
 std::shared_ptr< Mysql::Connection > Mysql::Statement::getConnection()
 {
diff --git a/deps/mysqlConnector/mysql_util.h b/deps/mysqlConnector/mysql_util.h
index 51c3edbf..624475ec 100644
--- a/deps/mysqlConnector/mysql_util.h
+++ b/deps/mysqlConnector/mysql_util.h
@@ -27,8 +27,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include <iostream>
 #include <sstream>
-#include <mysql.h>
 
+typedef struct st_mysql_field  MYSQL_FIELD;
 #ifndef UL64
 #ifdef _WIN32
 #define UL64(x) x##ui64
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index dfce49d8..d8579e93 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -38,7 +38,7 @@ if( UNIX )
 else()
   target_link_libraries( common
                            PUBLIC
-                             libmysql )
+                             mysql )
 endif()
 
 target_include_directories( common
diff --git a/src/common/Database/DbConnection.cpp b/src/common/Database/DbConnection.cpp
index 460d5bc0..aef19f6c 100644
--- a/src/common/Database/DbConnection.cpp
+++ b/src/common/Database/DbConnection.cpp
@@ -5,6 +5,7 @@
 
 #include "PreparedStatement.h"
 #include "Framework.h"
+#include <mysql.h>
 
 extern Core::Framework g_fw;
 
diff --git a/src/common/Database/DbWorkerPool.cpp b/src/common/Database/DbWorkerPool.cpp
index 9c917b6a..c645700a 100644
--- a/src/common/Database/DbWorkerPool.cpp
+++ b/src/common/Database/DbWorkerPool.cpp
@@ -8,6 +8,7 @@
 #include "Framework.h"
 
 #include "Logging/Logger.h"
+#include <mysql.h>
 
 extern Core::Framework g_fw;
 
diff --git a/src/servers/sapphire_lobby/CMakeLists.txt b/src/servers/sapphire_lobby/CMakeLists.txt
index 632a1151..b6000a47 100644
--- a/src/servers/sapphire_lobby/CMakeLists.txt
+++ b/src/servers/sapphire_lobby/CMakeLists.txt
@@ -20,8 +20,8 @@ set_target_properties( sapphire_lobby
                            VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/"
                      )
 target_link_libraries( sapphire_lobby 
-	                 PRIVATE 
-			   common )
+	                     PRIVATE
+			               common mysql )
 if( UNIX )
   target_link_libraries( sapphire_lobby 
   	                   PRIVATE 
diff --git a/src/servers/sapphire_zone/ServerZone.cpp b/src/servers/sapphire_zone/ServerZone.cpp
index 60e4b2bf..d60de3f3 100644
--- a/src/servers/sapphire_zone/ServerZone.cpp
+++ b/src/servers/sapphire_zone/ServerZone.cpp
@@ -1,24 +1,24 @@
+
+#include <Connection.h>
+#include <Network/Connection.h>
+#include <Network/Hive.h>
+#include <Network/PacketContainer.h>
+
+#include "Network/GameConnection.h"
 #include "ServerZone.h"
+#include "Framework.h"
 
 #include <Version.h>
 #include <Logging/Logger.h>
 #include <Config/ConfigMgr.h>
 
-#include <MySqlBase.h>
-#include <Connection.h>
-
-#include <Network/Connection.h>
-#include <Network/Hive.h>
-
 #include <Exd/ExdDataGenerated.h>
-#include <Network/PacketContainer.h>
 #include <Database/DatabaseDef.h>
-#include <Util/Util.h>
 
 #include "Actor/Player.h"
 #include "Actor/BNpcTemplate.h"
 
-#include "Network/GameConnection.h"
+
 #include "Session.h"
 
 #include "Zone/TerritoryMgr.h"
@@ -26,13 +26,6 @@
 #include "Script/ScriptMgr.h"
 #include "Linkshell/LinkshellMgr.h"
 
-#include "ForwardsZone.h"
-
-#include <Util/Util.h>
-#include <thread>
-
-#include "Framework.h"
-
 extern Core::Framework g_fw;
 
 Core::ServerZone::ServerZone( const std::string& configName ) :