diff options
Diffstat (limited to 'main/xulrunner/0004-xulrunner-malloc_usable_size.patch')
-rw-r--r-- | main/xulrunner/0004-xulrunner-malloc_usable_size.patch | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/main/xulrunner/0004-xulrunner-malloc_usable_size.patch b/main/xulrunner/0004-xulrunner-malloc_usable_size.patch deleted file mode 100644 index 986b183ec..000000000 --- a/main/xulrunner/0004-xulrunner-malloc_usable_size.patch +++ /dev/null @@ -1,34 +0,0 @@ -From: Timo Teräs <timo.teras@iki.fi> - -malloc_usable_size is not defined on uclibc, so workaround -that in jemalloc. Fix mozalloc linking. - ---- mozilla-release-old/memory/jemalloc/jemalloc.h -+++ mozilla-release/memory/jemalloc/jemalloc.h -@@ -75,8 +75,12 @@ - /* Linux has memalign and malloc_usable_size */ - #if !defined(MOZ_MEMORY_LINUX) - void *memalign(size_t alignment, size_t size); --size_t malloc_usable_size(const void *ptr); - #endif /* MOZ_MEMORY_LINUX */ -+ -+#include <features.h> -+#if defined(__UCLIBC__) || !defined(MOZ_MEMORY_LINUX) -+size_t malloc_usable_size(const void *ptr); -+#endif - - void jemalloc_stats(jemalloc_stats_t *stats); - ---- mozilla-release-old/memory/mozalloc/Makefile.in -+++ mozilla-release/memory/mozalloc/Makefile.in -@@ -43,6 +43,10 @@ - - include $(DEPTH)/config/autoconf.mk - -+ifdef MOZ_MEMORY -+SHARED_LIBRARY_LIBS = $(call EXPAND_LIBNAME_PATH,jemalloc,../jemalloc) -+endif -+ - VISIBILITY_FLAGS= - STL_FLAGS = - ifdef _MSC_VER |