wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Gian-Carlo Pascutto 2012-04-11 14:12:34 +02:00
parent f130bb952f
commit 4ef43a4fea
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
memory/mozalloc/mozalloc.cpp
View File

@ -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);

5
mozglue/android/nsGeckoUtils.cpp
View File

@ -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