summaryrefslogtreecommitdiffstats
path: root/main/xulrunner/uclibc-malloc_usable_size.patch
diff options
context:
space:
mode:
Diffstat (limited to 'main/xulrunner/uclibc-malloc_usable_size.patch')
-rw-r--r--main/xulrunner/uclibc-malloc_usable_size.patch19
1 files changed, 3 insertions, 16 deletions
diff --git a/main/xulrunner/uclibc-malloc_usable_size.patch b/main/xulrunner/uclibc-malloc_usable_size.patch
index 49b5a6430..b4a009317 100644
--- a/main/xulrunner/uclibc-malloc_usable_size.patch
+++ b/main/xulrunner/uclibc-malloc_usable_size.patch
@@ -11,9 +11,9 @@
VISIBILITY_FLAGS=
STL_FLAGS =
ifdef _MSC_VER
---- ./memory/mozalloc/mozalloc.cpp.orig
-+++ ./memory/mozalloc/mozalloc.cpp
-@@ -33,7 +33,7 @@
+--- ./memory/mozalloc/mozalloc.cpp.orig 2013-02-15 21:15:06.000000000 +0000
++++ ./memory/mozalloc/mozalloc.cpp 2013-02-20 08:00:26.328809270 +0000
+@@ -30,7 +30,7 @@
#include "mozilla/mozalloc_oom.h" // for mozalloc_handle_oom
/* Windows doesn't have malloc_usable_size, but jemalloc has */
@@ -22,16 +22,3 @@
extern "C" size_t malloc_usable_size(const void *ptr);
#endif
-@@ -213,10 +213,10 @@
-
- #if defined(XP_MACOSX)
- return malloc_size(ptr);
--#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID)) || defined(__FreeBSD__)
-+#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID)) && !defined(__UCLIBC__) || defined(__FreeBSD__)
- // Android bionic libc doesn't have malloc_usable_size.
- return malloc_usable_size(ptr);
--#elif defined(XP_WIN)
-+#elif defined(XP_WIN) || defined(__UCLIBC__)
- return _msize(ptr);
- #else
- return 0;