- Fixed char-sql compilation

- Added support for reading the item_db_db inter config settings (char-sql)
- Fixed some compile warnings (functions with no arguments should have a (void) instead of ()).


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8546 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 2 insertions, 3 deletions

diff --git a/src/map/mercenary.h b/src/map/mercenary.h
index bf30d7fe0..d116db77e 100644
--- a/src/map/mercenary.h
+++ b/src/map/mercenary.h
@@ -75,6 +75,5 @@ int merc_hom_increase_intimacy(struct homun_data * hd, unsigned int value);
 int merc_hom_decrease_intimacy(struct homun_data * hd, unsigned int value);

 int merc_skill_tree_get_max(int id, int b_class);

 void merc_hom_init_timers(struct homun_data * hd);

-void merc_skill_reload();

-void merc_reload();

-

+void merc_skill_reload(void);

+void merc_reload(void);