diff options
| author | Haru <haru@dotalux.com> | 2017-08-09 00:27:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-09 00:27:35 +0200 |
| commit | 248285d5a4be058b6abb40a9e31fff189bd2f598 (patch) | |
| tree | 0b4035b6267ffe9dc107add4a5ea859eb587cae3 /src | |
| parent | 537b2bb3510f52eb9ccdee4f98e6061b5878bff0 (diff) | |
| parent | a1a9ce04eeefb5ff00b2101732ef3f5e02d36093 (diff) | |
| download | hercules-248285d5a4be058b6abb40a9e31fff189bd2f598.tar.gz hercules-248285d5a4be058b6abb40a9e31fff189bd2f598.tar.bz2 hercules-248285d5a4be058b6abb40a9e31fff189bd2f598.tar.xz hercules-248285d5a4be058b6abb40a9e31fff189bd2f598.zip | |
Merge pull request #1816 from 4144/travis
Add into travis check for hpm update
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/cbasetypes.h | 7 | ||||
| -rw-r--r-- | src/plugins/HPMHooking.c | 6 |
2 files changed, 13 insertions, 0 deletions
diff --git a/src/common/cbasetypes.h b/src/common/cbasetypes.h index 2c36c23bc..5be2d62e4 100644 --- a/src/common/cbasetypes.h +++ b/src/common/cbasetypes.h @@ -306,6 +306,13 @@ typedef uintptr_t uintptr; #define PRAGMA_GCC46(str) #endif // ! defined(__GNUC__) && (defined(__clang__) || GCC_VERSION >= 40600) +// Pragma macro only enabled on gcc >= 5 or clang - borrowed from Mana Plus +#if defined(__GNUC__) && (GCC_VERSION >= 50000) +#define PRAGMA_GCC5(str) _Pragma(#str) +#else // ! defined(__GNUC__) && (GCC_VERSION >= 50000) +#define PRAGMA_GCC5(str) +#endif // ! defined(__GNUC__) && (GCC_VERSION >= 50000) + // fallthrough attribute only enabled on gcc >= 7.0 #if defined(__GNUC__) && (GCC_VERSION >= 70000) #define FALLTHROUGH __attribute__ ((fallthrough)); diff --git a/src/plugins/HPMHooking.c b/src/plugins/HPMHooking.c index a5354211d..6d6184402 100644 --- a/src/plugins/HPMHooking.c +++ b/src/plugins/HPMHooking.c @@ -26,6 +26,8 @@ #include "common/mmo.h" #include "common/socket.h" +PRAGMA_GCC5(GCC diagnostic push) +PRAGMA_GCC5(GCC diagnostic ignored "-Wdiscarded-qualifiers") #if defined (HPMHOOKING_LOGIN) #define HPM_SERVER_TYPE SERVER_TYPE_LOGIN #define HPM_CORE_INCLUDE "HPMHooking/HPMHooking_login.HPMHooksCore.inc" @@ -109,6 +111,7 @@ #define HPM_SOURCES_INCLUDE "HPMHooking/HPMHooking.sources.inc" #error HPMHooking plugin needs to be compiled for a specific server type. Please make sure your Makefiles are up to date. #endif +PRAGMA_GCC5(GCC diagnostic pop) #include "common/conf.h" #include "common/console.h" #include "common/db.h" @@ -212,7 +215,10 @@ HPExport bool HPM_Plugin_AddHook(enum HPluginHookType type, const char *target, return false; } +PRAGMA_GCC5(GCC diagnostic push) +PRAGMA_GCC5(GCC diagnostic ignored "-Wdiscarded-qualifiers") #include HPM_HOOKS_INCLUDE +PRAGMA_GCC5(GCC diagnostic pop) void HPM_HP_final(void) { int i, len = HPMHooks.data.total * 2; |