Bug 515492: Android build bustage fix.
authorKyle Huey <khuey@kylehuey.com>
Mon, 27 Jun 2011 16:59:20 -0700
changeset 72419 1773f004b6996e6a5fcbe51fa6245dcd88435aa2
parent 72418 749eeb73cda4e622bb7614d4625fd17e58a2f41a
child 72420 df1eee89e03122da77cf512f9cbf4efbb4a2d302
push id159
push usereakhgari@mozilla.com
push dateTue, 16 Aug 2011 17:53:11 +0000
treeherdermozilla-beta@8786e3e49240 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs515492
milestone7.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 515492: Android build bustage fix.
memory/jemalloc/jemalloc.h
--- a/memory/jemalloc/jemalloc.h
+++ b/memory/jemalloc/jemalloc.h
@@ -55,18 +55,20 @@ void	*je_malloc(size_t size);
 void	*je_valloc(size_t size);
 void	*je_calloc(size_t num, size_t size);
 void	*je_realloc(void *ptr, size_t size);
 void	je_free(void *ptr);
 void *je_memalign(size_t alignment, size_t size);
 int	je_posix_memalign(void **memptr, size_t alignment, size_t size);
 char    *je_strndup(const char *src, size_t len);
 char    *je_strdup(const char *src);
-#if defined(WIN32_NEW_STYLE_JEMALLOC)
-size_t  je_malloc_usable_size(void *ptr)
+#if defined(MOZ_MEMORY_ANDROID)
+size_t  je_malloc_usable_size(void *ptr);
+#else
+size_t	je_malloc_usable_size(const void *ptr);
 #endif
 #endif
 
 /* Linux has memalign and malloc_usable_size */
 #if !defined(MOZ_MEMORY_LINUX)
 void	*memalign(size_t alignment, size_t size);
 size_t	malloc_usable_size(const void *ptr);
 #endif /* MOZ_MEMORY_LINUX */