diff options
author | Er_Maqui <er_maqui@darkbolt.net> | 2015-10-21 14:54:40 +0200 |
---|---|---|
committer | Er_Maqui <er_maqui@darkbolt.net> | 2015-10-21 14:54:40 +0200 |
commit | 198aef7133713b47a4c4fadaac6811c9d3812d19 (patch) | |
tree | 84df335dd0ad350c20f8c2a018b2a7096907b636 /src/common/HPMDataCheck.h | |
parent | 6977d6d31b58afc5095c0a59e754f21ea1080054 (diff) | |
parent | 8b198db1e0ccc8209b7bcf54b4df62d4747f75b2 (diff) | |
download | hercules-198aef7133713b47a4c4fadaac6811c9d3812d19.tar.gz hercules-198aef7133713b47a4c4fadaac6811c9d3812d19.tar.bz2 hercules-198aef7133713b47a4c4fadaac6811c9d3812d19.tar.xz hercules-198aef7133713b47a4c4fadaac6811c9d3812d19.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/common/HPMDataCheck.h')
-rw-r--r-- | src/common/HPMDataCheck.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/common/HPMDataCheck.h b/src/common/HPMDataCheck.h index 510ea9d4e..923b6ccbf 100644 --- a/src/common/HPMDataCheck.h +++ b/src/common/HPMDataCheck.h @@ -144,16 +144,16 @@ HPExport const struct s_HPMDataCheck HPMDataCheck[] = { #else #define COMMON_HPMI_H #endif // COMMON_HPMI_H - #ifdef COMMON_MALLOC_H - { "malloc_interface", sizeof(struct malloc_interface), SERVER_TYPE_ALL }, - #else - #define COMMON_MALLOC_H - #endif // COMMON_MALLOC_H #ifdef COMMON_MAPINDEX_H { "mapindex_interface", sizeof(struct mapindex_interface), SERVER_TYPE_CHAR|SERVER_TYPE_MAP }, #else #define COMMON_MAPINDEX_H #endif // COMMON_MAPINDEX_H + #ifdef COMMON_MEMMGR_H + { "malloc_interface", sizeof(struct malloc_interface), SERVER_TYPE_ALL }, + #else + #define COMMON_MEMMGR_H + #endif // COMMON_MEMMGR_H #ifdef COMMON_MMO_H { "auction_data", sizeof(struct auction_data), SERVER_TYPE_ALL }, { "fame_list", sizeof(struct fame_list), SERVER_TYPE_ALL }, |