diff options
Diffstat (limited to 'memory/build/mozmemory.h')
| -rw-r--r-- | memory/build/mozmemory.h | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/memory/build/mozmemory.h b/memory/build/mozmemory.h index 84007fffb2..2ed63b9e1f 100644 --- a/memory/build/mozmemory.h +++ b/memory/build/mozmemory.h @@ -25,13 +25,6 @@ MOZ_BEGIN_EXTERN_C -/* - * On OSX, malloc/malloc.h contains the declaration for malloc_good_size, - * which will call back in jemalloc, through the zone allocator so just use it. - */ -#ifdef XP_DARWIN -# include <malloc/malloc.h> -#else MOZ_MEMORY_API size_t malloc_good_size_impl(size_t size); /* Note: the MOZ_GLUE_IN_PROGRAM ifdef below is there to avoid -Werror turning @@ -39,15 +32,15 @@ MOZ_MEMORY_API size_t malloc_good_size_impl(size_t size); * to use weak imports. */ static inline size_t _malloc_good_size(size_t size) { -# if defined(MOZ_GLUE_IN_PROGRAM) && !defined(IMPL_MFBT) +#if defined(MOZ_GLUE_IN_PROGRAM) && !defined(IMPL_MFBT) if (!malloc_good_size) return size; -# endif +#endif return malloc_good_size_impl(size); } -# define malloc_good_size _malloc_good_size -#endif +#define malloc_good_size _malloc_good_size + MOZ_JEMALLOC_API void jemalloc_stats(jemalloc_stats_t *stats); |