Bug 957450 - fix compile error in gonk-kk. r=iacobcatalin
authorKai-Zhen Li <kli@mozilla.com>
Fri, 10 Jan 2014 14:14:53 +0800
changeset 163253 977d6be3df401e327445fe6f30da6be230e65cd9
parent 163252 744e91ec69a300c78a130725c08c7c789970d6a0
child 163254 04c0a98a6255977e052d812cc12819f85e4d89e3
push id25989
push usercbook@mozilla.com
push dateTue, 14 Jan 2014 14:44:35 +0000
treeherdermozilla-central@be9f41887791 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersiacobcatalin
bugs957450
milestone29.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 957450 - fix compile error in gonk-kk. r=iacobcatalin
memory/build/malloc_decls.h
memory/mozjemalloc/jemalloc.c
--- a/memory/build/malloc_decls.h
+++ b/memory/build/malloc_decls.h
@@ -10,17 +10,17 @@
  *   - argument types
  */
 
 #ifndef malloc_decls_h
 #  define malloc_decls_h
 
 #  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;
 #  endif
 
 #  define MALLOC_FUNCS_MALLOC 1
 #  define MALLOC_FUNCS_JEMALLOC 2
 #  define MALLOC_FUNCS_INIT 4
--- a/memory/mozjemalloc/jemalloc.c
+++ b/memory/mozjemalloc/jemalloc.c
@@ -6595,17 +6595,17 @@ malloc_good_size_impl(size_t size)
 		 * malloc_good_size(n).
 		 */
 		size = PAGE_CEILING(size);
 	}
 	return 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
 MOZ_MEMORY_API size_t
 malloc_usable_size_impl(const void *ptr)
 #endif
 {
 	DARWIN_ONLY(return (szone->size)(szone, ptr));