diff options
Diffstat (limited to 'memory')
| -rw-r--r-- | memory/mozjemalloc/jemalloc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/memory/mozjemalloc/jemalloc.c b/memory/mozjemalloc/jemalloc.c index bbd68365b..5b8a6c326 100644 --- a/memory/mozjemalloc/jemalloc.c +++ b/memory/mozjemalloc/jemalloc.c @@ -5251,7 +5251,7 @@ malloc_init_hard(void) * Another thread initialized the allocator before this one * acquired init_lock. */ -#ifndef MOZ_MEMORY_WINDOWS +#if !(defined(MOZ_MEMORY_WINDOWS) || defined(__FreeBSD__)) malloc_mutex_unlock(&init_lock); #endif return (false); @@ -6755,7 +6755,8 @@ jemalloc_darwin_init(void) #define is_malloc_(a) malloc_is_ ## a #define is_malloc(a) is_malloc_(a) -#if !defined(MOZ_MEMORY_DARWIN) && (is_malloc(malloc_impl) == 1) +#if !(defined(MOZ_MEMORY_DARWIN) || defined(MOZ_MEMORY_BSD)) && \ + (is_malloc(malloc_impl) == 1) # if defined(__GLIBC__) && !defined(__UCLIBC__) /* * glibc provides the RTLD_DEEPBIND flag for dlopen which can make it possible |