Skip to content

Fix redefine HPM structs in multy file plugins #2608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MishimaHaruna merged 1 commit into from
Jan 12, 2020
Merged

Fix redefine HPM structs in multy file plugins #2608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/common/HPMi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,9 +241,15 @@ struct HPMi_interface {
#ifdef HERCULES_CORE
#define HPM_SYMBOL(n, s) (HPM->share((s), (n)), true)
#else // ! HERCULES_CORE
#ifdef HERCULES_CORE_HPMI_SKIP
extern struct HPMi_interface HPMi_s;
extern struct HPMi_interface *HPMi;
extern void *(*import_symbol) (char *name, unsigned int pID);
#else
HPExport struct HPMi_interface HPMi_s;
HPExport struct HPMi_interface *HPMi;
HPExport void *(*import_symbol) (char *name, unsigned int pID);
#endif
#define HPM_SYMBOL(n, s) ((s) = import_symbol((n),HPMi->pid))
#endif // !HERCULES_CORE

Expand Down
4 changes: 4 additions & 0 deletions src/plugins/HPMHooking.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,11 @@ struct HPMHooking_core_interface {
const char *(*Hooked)(bool *fr);
};
#else // ! HERCULES_CORE
#ifdef HERCULES_CORE_HPMI_SKIP
extern struct HPMHooking_interface HPMHooking_s;
#else
HPExport struct HPMHooking_interface HPMHooking_s;
#endif

#include "HPMHooking/HPMHooking.Defs.inc"

Expand Down