From c04636bda3d1836a9f745636de0c63ba71b9850e Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Wed, 26 Nov 2014 16:04:25 +0900 Subject: [PATCH] Bug 1104173 - Properly export jemalloc_* symbols from the jemalloc3 replace-malloc library. r=njn Bug 818922 made MOZ_REPLACE_MALLOC a global define, and that changed the defines set when building mozjemalloc_compat.c for the jemalloc3 replace-malloc library. In turn, this made the symbol munging wrong for that library, making the jemalloc_* functions exported as je_jemalloc_* instead of replace_jemalloc_*. --- memory/build/mozmemory_wrap.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/memory/build/mozmemory_wrap.h b/memory/build/mozmemory_wrap.h index bf89e6fb06d1..6e8920951876 100644 --- a/memory/build/mozmemory_wrap.h +++ b/memory/build/mozmemory_wrap.h @@ -127,7 +127,7 @@ #if !defined(MOZ_NATIVE_JEMALLOC) # ifdef MOZ_MEMORY_IMPL -# if defined(MOZ_JEMALLOC_IMPL) && defined(MOZ_REPLACE_MALLOC) +# if defined(MOZ_JEMALLOC_IMPL) && defined(MOZ_REPLACE_MALLOC) && !defined(MOZ_REPLACE_JEMALLOC) # define mozmem_malloc_impl(a) je_ ## a # define mozmem_jemalloc_impl(a) je_ ## a # else