summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAliaksey Kandratsenka <alk@tut.by>2014-05-18 10:59:06 -0700
committerAliaksey Kandratsenka <alk@tut.by>2014-06-21 12:12:04 -0700
commit2fe4b329ad4d3f242b0bd73295375e70be79187b (patch)
tree962d7fdfdf89c854373fe2a8fd8e3f51c13a6fea
parentc009398e3239be8ae6185ad83685caf7458c49bb (diff)
downloadgperftools-2fe4b329ad4d3f242b0bd73295375e70be79187b.tar.gz
applied chromium patch fixing some build issue on android
This applies patch from: https://codereview.chromium.org/284843002/ by jungjik.lee@samsung.com
-rw-r--r--[-rwxr-xr-x]src/libc_override_gcc_and_weak.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/libc_override_gcc_and_weak.h b/src/libc_override_gcc_and_weak.h
index fe9db47..818e43d 100755..100644
--- 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