Commit 12e5d134 authored by Gian-Carlo Pascutto's avatar Gian-Carlo Pascutto
Browse files

Bug 743715 - Cannot build Fennec without jemalloc. r=glandium

parent 8246ea1d

memory/mozalloc/mozalloc.cpp

+2 −4
Original line number Diff line number Diff line
@@ -243,10 +243,8 @@ moz_malloc_usable_size(void *ptr) 


#if defined(XP_MACOSX)

    return malloc_size(ptr);

#elif defined(MOZ_MEMORY) || defined(XP_LINUX)

    // XXX: the |defined(XP_LINUX)| may be too lax;  some Linux installations

    // might use a libc that doesn't have malloc_usable_size.  Let's fix this

    // if/when it happens.

#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID))

    // Android bionic libc doesn't have malloc_usable_size.

    return malloc_usable_size(ptr);

#elif defined(XP_WIN)

    return _msize(ptr);

mozglue/android/nsGeckoUtils.cpp

+5 −0
Original line number Diff line number Diff line
@@ -36,11 +36,16 @@ 
 * ***** END LICENSE BLOCK ***** */



#include <jni.h>



#ifdef MOZ_MEMORY

// Wrap malloc and free to use jemalloc

#define malloc __wrap_malloc

#define free __wrap_free

#endif



#include <stdlib.h>





extern "C"

__attribute__ ((visibility("default")))

void JNICALL