From c687d2d1b2ad48b5b15899f34b73a41ae73f674c Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 9 Jan 2020 00:27:14 +0300
Subject: Fix redefine HPM interfaces

---
 src/Makefile.am    | 1 +
 src/echar/init.c   | 3 +++
 src/ecommon/init.c | 5 +++++
 src/elogin/init.c  | 3 +++
 src/emap/init.c    | 3 +++
 5 files changed, 15 insertions(+)

diff --git a/src/Makefile.am b/src/Makefile.am
index 8c9a8d5..cf864f1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -138,6 +138,7 @@ MAP_SRC = emap/atcommand.c \
 
 SHARED_CFLAGS = ${CFLAGS} -O3 -pipe -ffast-math -std=c11 -Wall -Wextra -Wno-sign-compare -Wno-unused -fno-omit-frame-pointer \
     -DPCRE_SUPPORT -I../../.. -I../../../../3rdparty \
+    -DHERCULES_CORE_HPMI_SKIP \
     -DPACKETVER=20170517 \
     -DevolPacketOffset=0x100
 SHARED_LDFLAGS = -lm -avoid-version -Wl,--no-undefined
diff --git a/src/echar/init.c b/src/echar/init.c
index d42542c..e273b58 100644
--- a/src/echar/init.c
+++ b/src/echar/init.c
@@ -39,6 +39,9 @@
 #include "echar/config.h"
 
 #include "plugins/HPMHooking.h"
+
+HPExport struct HPMHooking_interface HPMHooking_s;
+
 #include "common/HPMDataCheck.h" /* should always be the last file included! (if you don't make it last, it'll intentionally break compile time) */
 
 HPExport struct hplugin_info pinfo =
diff --git a/src/ecommon/init.c b/src/ecommon/init.c
index 9185ee1..753fcf1 100644
--- a/src/ecommon/init.c
+++ b/src/ecommon/init.c
@@ -8,6 +8,11 @@
 #include <string.h>
 
 #include "common/HPMi.h"
+
+HPExport struct HPMi_interface HPMi_s;
+HPExport struct HPMi_interface *HPMi;
+HPExport void *(*import_symbol) (char *name, unsigned int pID);
+
 #include "common/conf.h"
 #include "common/memmgr.h"
 #include "common/mapindex.h"
diff --git a/src/elogin/init.c b/src/elogin/init.c
index 52a95bf..88f322c 100644
--- a/src/elogin/init.c
+++ b/src/elogin/init.c
@@ -25,6 +25,9 @@
 #include "elogin/parse.h"
 
 #include "plugins/HPMHooking.h"
+
+HPExport struct HPMHooking_interface HPMHooking_s;
+
 #include "common/HPMDataCheck.h" /* should always be the last file included! (if you don't make it last, it'll intentionally break compile time) */
 
 HPExport struct hplugin_info pinfo =
diff --git a/src/emap/init.c b/src/emap/init.c
index 0e83b9a..d4e8d11 100644
--- a/src/emap/init.c
+++ b/src/emap/init.c
@@ -80,6 +80,9 @@
 #include "emap/data/skilld.h"
 
 #include "plugins/HPMHooking.h"
+
+HPExport struct HPMHooking_interface HPMHooking_s;
+
 #include "common/HPMDataCheck.h" /* should always be the last file included! (if you don't make it last, it'll intentionally break compile time) */
 
 extern int langScriptId;
-- 
cgit v1.2.3-60-g2f50