From 5979fa3eb38c1d2ab5aafa3a9809d81c7e98f751 Mon Sep 17 00:00:00 2001 From: Kai-Zhen Li Date: Fri, 10 Jan 2014 14:14:53 +0800 Subject: [PATCH] Bug 957450 - fix compile error in gonk-kk. r=iacobcatalin --- memory/build/malloc_decls.h | 2 +- memory/mozjemalloc/jemalloc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/memory/build/malloc_decls.h b/memory/build/malloc_decls.h index ea73fa921367..4c0ab714add1 100644 --- a/memory/build/malloc_decls.h +++ b/memory/build/malloc_decls.h @@ -15,7 +15,7 @@ # include "jemalloc_types.h" -# ifdef __linux__ +# if defined(__linux__) || (defined(MOZ_MEMORY_ANDROID) && (ANDROID_VERSION < 19)) typedef void * usable_ptr_t; # else typedef const void * usable_ptr_t; diff --git a/memory/mozjemalloc/jemalloc.c b/memory/mozjemalloc/jemalloc.c index e4b24fa67eb3..4c938ba28bb2 100644 --- a/memory/mozjemalloc/jemalloc.c +++ b/memory/mozjemalloc/jemalloc.c @@ -6600,7 +6600,7 @@ malloc_good_size_impl(size_t size) } -#ifdef MOZ_MEMORY_ANDROID +#if defined(MOZ_MEMORY_ANDROID) && (ANDROID_VERSION < 19) MOZ_MEMORY_API size_t malloc_usable_size_impl(void *ptr) #else -- 2.11.4.GIT