diff options
author | Dastgir <dastgirpojee@rocketmail.com> | 2015-01-15 12:11:08 +0530 |
---|---|---|
committer | Dastgir <dastgirpojee@rocketmail.com> | 2015-01-15 12:11:08 +0530 |
commit | 06166cac023cefa193926de5a47dd7bc11f298b3 (patch) | |
tree | 3e235122b16652e9262736e82d0f0804680aae22 /src/common/malloc.h | |
parent | 9fbeb05aa054b5ed9641460d2639f30812edd957 (diff) | |
parent | 3c032b6766ded92ef032862ff3b812cad0eacefd (diff) | |
download | hercules-06166cac023cefa193926de5a47dd7bc11f298b3.tar.gz hercules-06166cac023cefa193926de5a47dd7bc11f298b3.tar.bz2 hercules-06166cac023cefa193926de5a47dd7bc11f298b3.tar.xz hercules-06166cac023cefa193926de5a47dd7bc11f298b3.zip |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/common/malloc.h')
-rw-r--r-- | src/common/malloc.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/common/malloc.h b/src/common/malloc.h index 53d2ebdd2..bc79ac65a 100644 --- a/src/common/malloc.h +++ b/src/common/malloc.h @@ -65,8 +65,12 @@ //void malloc_init (void); //void malloc_final (void); +#ifdef HERCULES_CORE void malloc_defaults(void); +void memmgr_report(int extra); +#endif // HERCULES_CORE + struct malloc_interface { void (*init) (void); void (*final) (void); @@ -85,7 +89,5 @@ struct malloc_interface { void (*post_shutdown) (void); }; -void memmgr_report (int extra); - struct malloc_interface *iMalloc; #endif /* COMMON_MALLOC_H */ |