From 2fe4b329ad4d3f242b0bd73295375e70be79187b Mon Sep 17 00:00:00 2001 From: Aliaksey Kandratsenka Date: Sun, 18 May 2014 10:59:06 -0700 Subject: applied chromium patch fixing some build issue on android This applies patch from: https://codereview.chromium.org/284843002/ by jungjik.lee@samsung.com --- src/libc_override_gcc_and_weak.h | 5 +++++ 1 file changed, 5 insertions(+) mode change 100755 => 100644 src/libc_override_gcc_and_weak.h diff --git a/src/libc_override_gcc_and_weak.h b/src/libc_override_gcc_and_weak.h old mode 100755 new mode 100644 index fe9db47..818e43d --- a/src/libc_override_gcc_and_weak.h +++ b/src/libc_override_gcc_and_weak.h @@ -90,7 +90,12 @@ extern "C" { struct mallinfo mallinfo(void) __THROW ALIAS(tc_mallinfo); #endif size_t malloc_size(void* p) __THROW ALIAS(tc_malloc_size); +#if defined(__ANDROID__) + size_t malloc_usable_size(const void* p) __THROW + ALIAS(tc_malloc_size); +#else size_t malloc_usable_size(void* p) __THROW ALIAS(tc_malloc_size); +#endif } // extern "C" #undef ALIAS -- cgit v1.2.1