summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2016-02-16 20:28:18 +0100
committerHaru <haru@dotalux.com>2016-02-17 10:40:45 +0100
commit1d2eb6d23519a971db0646a146152fc6f79350f1 (patch)
tree47d24a43925e95aea6acb8ff321cb9543600fda4 /src/common
parent10908446738f6e425de6e8fa50e8f91eb30c0478 (diff)
downloadhercules-1d2eb6d23519a971db0646a146152fc6f79350f1.tar.gz
hercules-1d2eb6d23519a971db0646a146152fc6f79350f1.tar.bz2
hercules-1d2eb6d23519a971db0646a146152fc6f79350f1.tar.xz
hercules-1d2eb6d23519a971db0646a146152fc6f79350f1.zip
Replaced some now unnecessary includes with forward declarations in header files
Added some forgotten <stdio.h> and "common/conf.h" includes to .c files, that were previously masked by the above. Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/common')
-rw-r--r--src/common/showmsg.c3
-rw-r--r--src/common/showmsg.h5
-rw-r--r--src/common/socket.c1
-rw-r--r--src/common/socket.h3
-rw-r--r--src/common/sql.c1
5 files changed, 8 insertions, 5 deletions
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 <libconfig/libconfig.h>
-
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h> // 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 <libconfig/libconfig.h>
-
#include <stdarg.h>
+/* 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 <sys/types.h>
#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 <mysql.h>
+#include <stdio.h>
#include <stdlib.h> // strtoul
void hercules_mysql_error_handler(unsigned int ecode);