From 03a5c603be2cf6d5feea9012029f8899c624557a Mon Sep 17 00:00:00 2001 From: Haru Date: Tue, 16 Feb 2016 18:07:52 +0100 Subject: Removed unnecessary typedefs from libconfig Signed-off-by: Haru --- src/map/itemdb.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/map/itemdb.h') diff --git a/src/map/itemdb.h b/src/map/itemdb.h index 8a0ec389d..8c2a7ac53 100644 --- a/src/map/itemdb.h +++ b/src/map/itemdb.h @@ -631,8 +631,8 @@ struct itemdb_interface { void (*read_combos) (void); int (*gendercheck) (struct item_data *id); int (*validate_entry) (struct item_data *entry, int n, const char *source); - void (*readdb_additional_fields) (int itemid, config_setting_t *it, int n, const char *source); - int (*readdb_libconfig_sub) (config_setting_t *it, int n, const char *source); + void (*readdb_additional_fields) (int itemid, struct config_setting_t *it, int n, const char *source); + int (*readdb_libconfig_sub) (struct config_setting_t *it, int n, const char *source); int (*readdb_libconfig) (const char *filename); uint64 (*unique_id) (struct map_session_data *sd); void (*read) (bool minimal); @@ -641,7 +641,7 @@ struct itemdb_interface { void (*clear) (bool total); struct item_combo * (*id2combo) (unsigned short id); bool (*is_item_usable) (struct item_data *item); - bool (*lookup_const) (const config_setting_t *it, const char *name, int *value); + bool (*lookup_const) (const struct config_setting_t *it, const char *name, int *value); }; #ifdef HERCULES_CORE -- cgit v1.2.3-70-g09d2 From 1d2eb6d23519a971db0646a146152fc6f79350f1 Mon Sep 17 00:00:00 2001 From: Haru Date: Tue, 16 Feb 2016 20:28:18 +0100 Subject: Replaced some now unnecessary includes with forward declarations in header files Added some forgotten and "common/conf.h" includes to .c files, that were previously masked by the above. Signed-off-by: Haru --- src/char/pincode.c | 1 + src/common/showmsg.c | 3 +-- src/common/showmsg.h | 5 +++-- src/common/socket.c | 1 + src/common/socket.h | 3 ++- src/common/sql.c | 1 + src/login/login.c | 1 - src/map/atcommand.h | 2 +- src/map/itemdb.h | 2 +- src/map/mob.c | 1 + src/map/pc_groups.h | 4 +++- src/map/quest.h | 3 ++- src/map/script.c | 1 + src/map/status.h | 2 +- 14 files changed, 19 insertions(+), 11 deletions(-) (limited to 'src/map/itemdb.h') diff --git a/src/char/pincode.c b/src/char/pincode.c index af79d6f11..371442fac 100644 --- a/src/char/pincode.c +++ b/src/char/pincode.c @@ -32,6 +32,7 @@ #include "common/socket.h" #include "common/strlib.h" +#include #include struct pincode_interface pincode_s; diff --git a/src/common/showmsg.c b/src/common/showmsg.c index 9e2ff9898..4d4c72b42 100644 --- a/src/common/showmsg.c +++ b/src/common/showmsg.c @@ -23,11 +23,10 @@ #include "showmsg.h" #include "common/cbasetypes.h" +#include "common/conf.h" #include "common/core.h" //[Ind] - For SERVER_TYPE #include "common/strlib.h" // StringBuf -#include - #include #include #include // atexit diff --git a/src/common/showmsg.h b/src/common/showmsg.h index 85a1527bd..7b48d0df2 100644 --- a/src/common/showmsg.h +++ b/src/common/showmsg.h @@ -23,10 +23,11 @@ #include "common/hercules.h" -#include - #include +/* Forward Declarations */ +struct config_setting_t; + // for help with the console colors look here: // http://www.edoceo.com/liberum/?doc=printf-with-color // some code explanation (used here): diff --git a/src/common/socket.c b/src/common/socket.c index 1fc1b2bff..8b1ab3959 100644 --- a/src/common/socket.c +++ b/src/common/socket.c @@ -25,6 +25,7 @@ #include "common/HPM.h" #include "common/cbasetypes.h" +#include "common/conf.h" #include "common/db.h" #include "common/memmgr.h" #include "common/mmo.h" diff --git a/src/common/socket.h b/src/common/socket.h index 5103c3850..70fbc3492 100644 --- a/src/common/socket.h +++ b/src/common/socket.h @@ -22,7 +22,6 @@ #define COMMON_SOCKET_H #include "common/hercules.h" -#include "common/conf.h" #include "common/db.h" #ifdef WIN32 @@ -34,7 +33,9 @@ # include #endif +/* Forward Declarations */ struct hplugin_data_store; +struct config_setting_t; #define FIFOSIZE_SERVERLINK 256*1024 diff --git a/src/common/sql.c b/src/common/sql.c index f6280c436..b1e77e636 100644 --- a/src/common/sql.c +++ b/src/common/sql.c @@ -32,6 +32,7 @@ # include "common/winapi.h" // Needed before mysql.h #endif #include +#include #include // strtoul void hercules_mysql_error_handler(unsigned int ecode); diff --git a/src/login/login.c b/src/login/login.c index d4768df86..71cdded02 100644 --- a/src/login/login.c +++ b/src/login/login.c @@ -28,7 +28,6 @@ #include "login/loginlog.h" #include "common/HPM.h" #include "common/cbasetypes.h" -#include "common/conf.h" #include "common/core.h" #include "common/db.h" #include "common/memmgr.h" diff --git a/src/map/atcommand.h b/src/map/atcommand.h index 384bab20d..a4f9afce7 100644 --- a/src/map/atcommand.h +++ b/src/map/atcommand.h @@ -23,7 +23,6 @@ #include "map/pc_groups.h" #include "common/hercules.h" -#include "common/conf.h" #include "common/db.h" #include @@ -34,6 +33,7 @@ struct map_session_data; struct AtCommandInfo; struct block_list; +struct config_setting_t; /** * Defines diff --git a/src/map/itemdb.h b/src/map/itemdb.h index 8c2a7ac53..b83c27ed2 100644 --- a/src/map/itemdb.h +++ b/src/map/itemdb.h @@ -23,10 +23,10 @@ /* #include "map/map.h" */ #include "common/hercules.h" -#include "common/conf.h" #include "common/db.h" #include "common/mmo.h" // ITEM_NAME_LENGTH +struct config_setting_t; struct script_code; struct hplugin_data_store; diff --git a/src/map/mob.c b/src/map/mob.c index 85e1ad5d5..2ae54ba69 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -46,6 +46,7 @@ #include "map/status.h" #include "common/HPM.h" #include "common/cbasetypes.h" +#include "common/conf.h" #include "common/db.h" #include "common/ers.h" #include "common/memmgr.h" diff --git a/src/map/pc_groups.h b/src/map/pc_groups.h index 52ad25191..3f95237b7 100644 --- a/src/map/pc_groups.h +++ b/src/map/pc_groups.h @@ -22,9 +22,11 @@ #define MAP_PC_GROUPS_H #include "common/hercules.h" -#include "common/conf.h" #include "common/db.h" +/* Forward Declarations */ +struct config_setting_t; + /// PC permissions enum e_pc_permission { PC_PERM_NONE = 0, // #0 diff --git a/src/map/quest.h b/src/map/quest.h index a4d778219..e0768ef40 100644 --- a/src/map/quest.h +++ b/src/map/quest.h @@ -22,10 +22,11 @@ #define MAP_QUEST_H #include "common/hercules.h" -#include "common/conf.h" #include "common/mmo.h" // enum quest_state +/* Forward Declarations */ struct block_list; +struct config_setting_t; struct map_session_data; #define MAX_QUEST_DB (60355+1) // Highest quest ID + 1 diff --git a/src/map/script.c b/src/map/script.c index e6a9c8ae4..4b3bf960c 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -55,6 +55,7 @@ #include "map/storage.h" #include "map/unit.h" #include "common/cbasetypes.h" +#include "common/conf.h" #include "common/memmgr.h" #include "common/md5calc.h" #include "common/mmo.h" // NEW_CARTS diff --git a/src/map/status.h b/src/map/status.h index 1f28826a5..85219b280 100644 --- a/src/map/status.h +++ b/src/map/status.h @@ -21,11 +21,11 @@ #ifndef MAP_STATUS_H #define MAP_STATUS_H -#include "common/conf.h" #include "common/hercules.h" #include "common/mmo.h" // NEW_CARTS struct block_list; +struct config_setting_t; struct elemental_data; struct homun_data; struct mercenary_data; -- cgit v1.2.3-70-g09d2