diff options
| author | Ruben Rodriguez <ruben@gnu.org> | 2015-07-23 11:57:18 -0500 |
|---|---|---|
| committer | Ruben Rodriguez <ruben@gnu.org> | 2015-10-12 23:20:25 -0500 |
| commit | 50557a44e8257abc03913ed5b0828e9fa509dc85 (patch) | |
| tree | ad3e0de888a7925c17bd522a339d8837a470f145 /data/patches/gnuzilla-bug-1172632-1.patch | |
| parent | 6a6d63d8f2e6e04644fcf93d9937508af6eefff2 (diff) | |
Finished v38 initial rebase
Diffstat (limited to 'data/patches/gnuzilla-bug-1172632-1.patch')
| -rw-r--r-- | data/patches/gnuzilla-bug-1172632-1.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/data/patches/gnuzilla-bug-1172632-1.patch b/data/patches/gnuzilla-bug-1172632-1.patch new file mode 100644 index 0000000..326dc34 --- /dev/null +++ b/data/patches/gnuzilla-bug-1172632-1.patch @@ -0,0 +1,43 @@ +From 24f14fc16f5ef9046987d45019d98523c27c506c Mon Sep 17 00:00:00 2001 +From: Mike Hommey <mh+mozilla@glandium.org> +Date: Tue, 9 Jun 2015 09:54:24 +0900 +Subject: [PATCH] Bug 1172632 - Don't guess malloc_usable_size type of argument + based on ANDROID_VERSION in mozjemalloc, but use the result of the configure + test instead + +--- + memory/mozjemalloc/jemalloc.c | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/memory/mozjemalloc/jemalloc.c b/memory/mozjemalloc/jemalloc.c +index f8e36e1..9113d26 100644 +--- a/memory/mozjemalloc/jemalloc.c ++++ b/memory/mozjemalloc/jemalloc.c +@@ -6509,23 +6509,18 @@ malloc_good_size_impl(size_t size) + * malloc_good_size(n). + */ + size = PAGE_CEILING(size); + } + return size; + } + + +-#if defined(MOZ_MEMORY_ANDROID) && (ANDROID_VERSION < 19) + MOZ_MEMORY_API size_t +-malloc_usable_size_impl(void *ptr) +-#else +-MOZ_MEMORY_API size_t +-malloc_usable_size_impl(const void *ptr) +-#endif ++malloc_usable_size_impl(MALLOC_USABLE_SIZE_CONST_PTR void *ptr) + { + DARWIN_ONLY(return (szone->size)(szone, ptr)); + + #ifdef MALLOC_VALIDATE + return (isalloc_validate(ptr)); + #else + assert(ptr != NULL); + +-- +2.4.0.2.g36460d1.dirty + |