Dropped typedef from DBMap

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

6 files changed, 14 insertions, 10 deletions

diff --git a/src/char/char.c b/src/char/char.c
index 01262fdcb..929473e33 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -162,7 +162,7 @@ unsigned short skillid2idx[MAX_SKILL_ID];
 //-----------------------------------------------------
 #define AUTH_TIMEOUT 30000
 
-static DBMap* auth_db; // int account_id -> struct char_auth_node*
+static struct DBMap *auth_db; // int account_id -> struct char_auth_node*
 
 //-----------------------------------------------------
 // Online User Database
diff --git a/src/char/char.h b/src/char/char.h
index 4fe602c45..9cde18e96 100644
--- a/src/char/char.h
+++ b/src/char/char.h
@@ -98,8 +98,8 @@ struct char_interface {
 	struct mmo_map_server server[MAX_MAP_SERVERS];
 	int login_fd;
 	int char_fd;
-	DBMap* online_char_db; // int account_id -> struct online_char_data*
-	DBMap* char_db_;
+	struct DBMap *online_char_db; // int account_id -> struct online_char_data*
+	struct DBMap *char_db_;
 	char userid[NAME_LENGTH];
 	char passwd[NAME_LENGTH];
 	char server_name[20];
diff --git a/src/char/int_auction.h b/src/char/int_auction.h
index 29b068dfd..ccd5bfbf5 100644
--- a/src/char/int_auction.h
+++ b/src/char/int_auction.h
@@ -22,14 +22,16 @@
 #define CHAR_INT_AUCTION_H
 
 #include "common/hercules.h"
-#include "common/db.h"
 #include "common/mmo.h"
 
+/* Forward Declarations */
+struct DBMap; // common/db.h
+
 /**
  * inter_auction_interface interface
  **/
 struct inter_auction_interface {
-	DBMap* db; // int auction_id -> struct auction_data*
+	struct DBMap *db; // int auction_id -> struct auction_data*
 	int (*count) (int char_id, bool buy);
 	void (*save) (struct auction_data *auction);
 	unsigned int (*create) (struct auction_data *auction);
diff --git a/src/char/int_guild.h b/src/char/int_guild.h
index 31c334cbf..252c2dc47 100644
--- a/src/char/int_guild.h
+++ b/src/char/int_guild.h
@@ -44,8 +44,8 @@ enum {
  * inter_guild interface
  **/
 struct inter_guild_interface {
-	DBMap* guild_db; // int guild_id -> struct guild*
-	DBMap* castle_db;
+	struct DBMap *guild_db; // int guild_id -> struct guild*
+	struct DBMap *castle_db;
 	unsigned int exp[MAX_GUILDLEVEL];
 
 	int (*save_timer) (int tid, int64 tick, int id, intptr_t data);
diff --git a/src/char/int_party.h b/src/char/int_party.h
index e6ad75bb8..62fef4192 100644
--- a/src/char/int_party.h
+++ b/src/char/int_party.h
@@ -22,9 +22,11 @@
 #define CHAR_INT_PARTY_H
 
 #include "common/hercules.h"
-#include "common/db.h"
 #include "common/mmo.h"
 
+/* Forward Declarations */
+struct DBMap; // common/db.h
+
 //Party Flags on what to save/delete.
 enum {
 	PS_CREATE = 0x01, //Create a new party entry (index holds leader's info)
@@ -47,7 +49,7 @@ struct party_data {
  **/
 struct inter_party_interface {
 	struct party_data *pt;
-	DBMap* db;  // int party_id -> struct party_data*
+	struct DBMap *db;  // int party_id -> struct party_data*
 	int (*check_lv) (struct party_data *p);
 	void (*calc_state) (struct party_data *p);
 	int (*tosql) (struct party *p, int flag, int index);
diff --git a/src/char/inter.c b/src/char/inter.c
index cf648c238..9fea2885c 100644
--- a/src/char/inter.c
+++ b/src/char/inter.c
@@ -83,7 +83,7 @@ struct WisData {
 	int64 tick;
 	unsigned char src[24], dst[24], msg[512];
 };
-static DBMap* wis_db = NULL; // int wis_id -> struct WisData*
+static struct DBMap *wis_db = NULL; // int wis_id -> struct WisData*
 static int wis_dellist[WISDELLIST_MAX], wis_delnum;
 
 #define MAX_JOB_NAMES 150