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/HPMSymbols.inc.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/HPMSymbols.inc.h')
| -rw-r--r-- | src/common/HPMSymbols.inc.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/common/HPMSymbols.inc.h b/src/common/HPMSymbols.inc.h index 3a4c5852c..4c3722b69 100644 --- a/src/common/HPMSymbols.inc.h +++ b/src/common/HPMSymbols.inc.h @@ -125,9 +125,9 @@ struct loginif_interface *loginif; #ifdef MAP_MAIL_H /* mail */ struct mail_interface *mail; #endif // MAP_MAIL_H -#ifdef COMMON_MALLOC_H /* iMalloc */ +#ifdef COMMON_MEMMGR_H /* iMalloc */ struct malloc_interface *iMalloc; -#endif // COMMON_MALLOC_H +#endif // COMMON_MEMMGR_H #ifdef MAP_MAP_H /* map */ struct map_interface *map; #endif // MAP_MAP_H @@ -348,9 +348,9 @@ if ((server_type&(SERVER_TYPE_CHAR)) && !HPM_SYMBOL("loginif", loginif)) return #ifdef MAP_MAIL_H /* mail */ if ((server_type&(SERVER_TYPE_MAP)) && !HPM_SYMBOL("mail", mail)) return "mail"; #endif // MAP_MAIL_H -#ifdef COMMON_MALLOC_H /* iMalloc */ +#ifdef COMMON_MEMMGR_H /* iMalloc */ if ((server_type&(SERVER_TYPE_ALL)) && !HPM_SYMBOL("iMalloc", iMalloc)) return "iMalloc"; -#endif // COMMON_MALLOC_H +#endif // COMMON_MEMMGR_H #ifdef MAP_MAP_H /* map */ if ((server_type&(SERVER_TYPE_MAP)) && !HPM_SYMBOL("map", map)) return "map"; #endif // MAP_MAP_H |