Removed unnecessary typedefs from sql.h

- Sql -> struct Sql
- SqlStmt -> struct SqlStmt
- SqlDataType -> enum SqlDataType

This is expected to improve compile time, by removing #include cycles (and forward declaring instead)

Signed-off-by: Haru <haru@dotalux.com>

9 files changed, 26 insertions, 17 deletions

diff --git a/src/map/log.c b/src/map/log.c
index 072f7b6fd..245229a15 100644
--- a/src/map/log.c
+++ b/src/map/log.c
@@ -119,8 +119,9 @@ bool should_log_item(int nameid, int amount, int refine, struct item_data *id) {
 
 	return false;
 }
-void log_branch_sub_sql(struct map_session_data* sd) {
-	SqlStmt* stmt;
+void log_branch_sub_sql(struct map_session_data* sd)
+{
+	struct SqlStmt *stmt;
 
 	nullpo_retv(sd);
 	stmt = SQL->StmtMalloc(logs->mysql_handle);
@@ -279,8 +280,9 @@ void log_mvpdrop(struct map_session_data* sd, int monster_id, int* log_mvp)
 	logs->mvpdrop_sub(sd,monster_id,log_mvp);
 }
 
-void log_atcommand_sub_sql(struct map_session_data* sd, const char* message) {
-	SqlStmt* stmt;
+void log_atcommand_sub_sql(struct map_session_data* sd, const char* message)
+{
+	struct SqlStmt *stmt;
 
 	nullpo_retv(sd);
 	nullpo_retv(message);
@@ -322,8 +324,9 @@ void log_atcommand(struct map_session_data* sd, const char* message)
 	logs->atcommand_sub(sd,message);
 }
 
-void log_npc_sub_sql(struct map_session_data *sd, const char *message) {
-	SqlStmt* stmt;
+void log_npc_sub_sql(struct map_session_data *sd, const char *message)
+{
+	struct SqlStmt *stmt;
 
 	nullpo_retv(sd);
 	nullpo_retv(message);
@@ -379,7 +382,7 @@ void log_npc(struct map_session_data* sd, const char* message)
  */
 void log_chat_sub_sql(e_log_chat_type type, int type_id, int src_charid, int src_accid, const char *mapname, int x, int y, const char *dst_charname, const char *message)
 {
-	SqlStmt* stmt;
+	struct SqlStmt* stmt;
 
 	nullpo_retv(dst_charname);
 	nullpo_retv(message);
diff --git a/src/map/log.h b/src/map/log.h
index 69622adc6..0a5e13208 100644
--- a/src/map/log.h
+++ b/src/map/log.h
@@ -22,11 +22,11 @@
 #define MAP_LOG_H
 
 #include "common/hercules.h"
-#include "common/sql.h"
 
 /**
  * Declarations
  **/
+struct Sql; // common/sql.h
 struct item;
 struct item_data;
 struct map_session_data;
@@ -127,7 +127,7 @@ struct log_interface {
 	char db_id[32];
 	char db_pw[100];
 	char db_name[32];
-	Sql* mysql_handle;
+	struct Sql *mysql_handle;
 	/* */
 	void (*pick_pc) (struct map_session_data* sd, e_log_pick_type type, int amount, struct item* itm, struct item_data *data);
 	void (*pick_mob) (struct mob_data* md, e_log_pick_type type, int amount, struct item* itm, struct item_data *data);
diff --git a/src/map/map.c b/src/map/map.c
index f2e47be74..a93fb3fd3 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -69,6 +69,7 @@
 #include "common/random.h"
 #include "common/showmsg.h"
 #include "common/socket.h" // WFIFO*()
+#include "common/sql.h"
 #include "common/strlib.h"
 #include "common/timer.h"
 #include "common/utils.h"
diff --git a/src/map/map.h b/src/map/map.h
index 54b0c3575..e61c64f2d 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -27,11 +27,12 @@
 #include "common/db.h"
 #include "common/mapindex.h"
 #include "common/mmo.h"
-#include "common/sql.h"
 
 #include <stdio.h>
 #include <stdarg.h>
 
+/* Forward Declarations */
+struct Sql; // common/sql.h
 struct mob_data;
 struct npc_data;
 struct channel_data;
@@ -993,7 +994,7 @@ struct map_interface {
 	char server_id[32];
 	char server_pw[100];
 	char server_db[32];
-	Sql* mysql_handle;
+	struct Sql *mysql_handle;
 
 	int port;
 	int users;
diff --git a/src/map/mapreg_sql.c b/src/map/mapreg_sql.c
index 46962ac14..f3ab36950 100644
--- a/src/map/mapreg_sql.c
+++ b/src/map/mapreg_sql.c
@@ -190,7 +190,7 @@ void script_load_mapreg(void) {
 	   | varname | index | value |
 	   +-------------------------+
 	                                */
-	SqlStmt* stmt = SQL->StmtMalloc(map->mysql_handle);
+	struct SqlStmt *stmt = SQL->StmtMalloc(map->mysql_handle);
 	char varname[SCRIPT_VARNAME_LENGTH+1];
 	int index;
 	char value[255+1];
diff --git a/src/map/npc.c b/src/map/npc.c
index 93981e312..7fad5dd7c 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -47,6 +47,7 @@
 #include "common/nullpo.h"
 #include "common/showmsg.h"
 #include "common/socket.h"
+#include "common/sql.h"
 #include "common/strlib.h"
 #include "common/timer.h"
 #include "common/utils.h"
@@ -1514,8 +1515,9 @@ int npc_buylist_sub(struct map_session_data *sd, struct itemlist *item_list, str
 /**
  * Loads persistent NPC Market Data from SQL
  **/
-void npc_market_fromsql(void) {
-	SqlStmt* stmt = SQL->StmtMalloc(map->mysql_handle);
+void npc_market_fromsql(void)
+{
+	struct SqlStmt *stmt = SQL->StmtMalloc(map->mysql_handle);
 	char name[NAME_LENGTH+1];
 	int itemid;
 	int amount;
diff --git a/src/map/pc.c b/src/map/pc.c
index e958f32b6..4b70a49f3 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -63,6 +63,7 @@
 #include "common/random.h"
 #include "common/showmsg.h"
 #include "common/socket.h"
+#include "common/sql.h"
 #include "common/strlib.h" // safestrncpy()
 #include "common/sysinfo.h"
 #include "common/timer.h"
diff --git a/src/map/script.c b/src/map/script.c
index 3482165f8..aeff221d4 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -63,6 +63,7 @@
 #include "common/random.h"
 #include "common/showmsg.h"
 #include "common/socket.h" // usage: getcharip
+#include "common/sql.h"
 #include "common/strlib.h"
 #include "common/sysinfo.h"
 #include "common/timer.h"
@@ -15932,7 +15933,7 @@ BUILDIN(setd)
 	return true;
 }
 
-int buildin_query_sql_sub(struct script_state* st, Sql* handle)
+int buildin_query_sql_sub(struct script_state *st, struct Sql *handle)
 {
 	int i, j;
 	struct map_session_data *sd = NULL;
diff --git a/src/map/script.h b/src/map/script.h
index b8e9d1997..e5a8d3edd 100644
--- a/src/map/script.h
+++ b/src/map/script.h
@@ -25,7 +25,6 @@
 #include "common/hercules.h"
 #include "common/db.h"
 #include "common/mmo.h" // struct item
-#include "common/sql.h" // Sql
 #include "common/strlib.h" //StringBuf
 
 #include <errno.h>
@@ -34,6 +33,7 @@
 /**
  * Declarations
  **/
+struct Sql; // common/sql.h
 struct eri;
 struct item_data;
 
@@ -773,7 +773,7 @@ struct script_interface {
 	int (*playbgm_sub) (struct block_list *bl, va_list ap);
 	int (*playbgm_foreachpc_sub) (struct map_session_data *sd, va_list args);
 	int (*soundeffect_sub) (struct block_list *bl, va_list ap);
-	int (*buildin_query_sql_sub) (struct script_state *st, Sql *handle);
+	int (*buildin_query_sql_sub) (struct script_state *st, struct Sql *handle);
 	int (*buildin_instance_warpall_sub) (struct block_list *bl, va_list ap);
 	int (*buildin_mobuseskill_sub) (struct block_list *bl, va_list ap);
 	int (*cleanfloor_sub) (struct block_list *bl, va_list ap);