Bug 1172632 - Don't guess malloc_usable_size type of argument based o…

…n ANDROID_VERSION in mozjemalloc, but use the result of the configure test instead. r=njn
dothq · Jun 10, 2015 · f61d5cb · f61d5cb
1 parent 54bccdc
commit f61d5cb
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/memory/mozjemalloc/jemalloc.c b/memory/mozjemalloc/jemalloc.c
@@ -6514,13 +6514,8 @@ malloc_good_size_impl(size_t 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));