From 267ef2df773958ffa0a1dce5a64345aeb524dd72 Mon Sep 17 00:00:00 2001 From: Takanori MATSUURA Date: Sun, 7 Mar 2010 10:53:46 +0100 Subject: [PATCH] Bug 526389 - Skip redefinition of memory allocation functions for MacOS X and Linux. r=jasone --- memory/jemalloc/jemalloc.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/memory/jemalloc/jemalloc.h b/memory/jemalloc/jemalloc.h index 399895deb577..5c4e8360822d 100644 --- a/memory/jemalloc/jemalloc.h +++ b/memory/jemalloc/jemalloc.h @@ -79,16 +79,21 @@ typedef struct { size_t dirty; /* Bytes dirty (committed unused pages). */ } jemalloc_stats_t; -#ifndef MOZ_MEMORY_DARWIN +/* Darwin and Linux already have memory allocation functions */ +#if (!defined(MOZ_MEMORY_DARWIN) && !defined(MOZ_MEMORY_LINUX)) void *malloc(size_t size); void *valloc(size_t size); void *calloc(size_t num, size_t size); void *realloc(void *ptr, size_t size); void free(void *ptr); -#endif - int posix_memalign(void **memptr, size_t alignment, size_t size); +#endif /* MOZ_MEMORY_DARWIN, MOZ_MEMORY_LINUX */ + +/* Linux has memalign */ +#if !defined(MOZ_MEMORY_LINUX) void *memalign(size_t alignment, size_t size); +#endif /* MOZ_MEMORY_LINUX */ + size_t malloc_usable_size(const void *ptr); void jemalloc_stats(jemalloc_stats_t *stats);