summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2014-11-16 01:45:16 +0100
committerHaru <haru@dotalux.com>2014-11-16 07:16:22 +0100
commit144e519b095590439968b70141229638c75f207f (patch)
treeefc8fd4a52285a58b80494ea9fb3ec42fa4c439f
parent72c36285c7cda6b953782b2291474ef25b8763ee (diff)
downloadhercules-144e519b095590439968b70141229638c75f207f.tar.gz
hercules-144e519b095590439968b70141229638c75f207f.tar.bz2
hercules-144e519b095590439968b70141229638c75f207f.tar.xz
hercules-144e519b095590439968b70141229638c75f207f.zip
Moved HPM_s into HPM.c and removed the HPMi_s symbol from the core
Signed-off-by: Haru <haru@dotalux.com>
-rw-r--r--src/common/HPM.c1
-rw-r--r--src/common/HPM.h2
-rw-r--r--src/common/HPMi.h3
3 files changed, 4 insertions, 2 deletions
diff --git a/src/common/HPM.c b/src/common/HPM.c
index 7a875d1c4..003f2d935 100644
--- a/src/common/HPM.c
+++ b/src/common/HPM.c
@@ -30,6 +30,7 @@
struct malloc_interface iMalloc_HPM;
struct malloc_interface *HPMiMalloc;
+struct HPM_interface HPM_s;
/**
* (char*) data name -> (unsigned int) HPMDataCheck[] index
diff --git a/src/common/HPM.h b/src/common/HPM.h
index a4ea504e6..4e1aa5beb 100644
--- a/src/common/HPM.h
+++ b/src/common/HPM.h
@@ -154,7 +154,7 @@ struct HPM_interface {
bool (*DataCheck) (struct s_HPMDataCheck *src, unsigned int size, int version, char *name);
void (*datacheck_init) (const struct s_HPMDataCheck *src, unsigned int length, int version);
void (*datacheck_final) (void);
-} HPM_s;
+};
struct HPM_interface *HPM;
diff --git a/src/common/HPMi.h b/src/common/HPMi.h
index 0f2bed10d..1022a1ec2 100644
--- a/src/common/HPMi.h
+++ b/src/common/HPMi.h
@@ -204,8 +204,9 @@ HPExport struct HPMi_interface {
bool (*addConf) (unsigned int pluginID, enum HPluginConfType type, char *name, void (*func) (const char *val));
/* pc group permission */
void (*addPCGPermission) (unsigned int pluginID, char *name, unsigned int *mask);
-} HPMi_s;
+};
#ifndef HERCULES_CORE
+HPExport struct HPMi_interface HPMi_s;
HPExport struct HPMi_interface *HPMi;
#endif