diff options
| author | jungjik.lee@samsung.com <jungjik.lee@samsung.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-16 11:48:14 +0000 |
|---|---|---|
| committer | jungjik.lee@samsung.com <jungjik.lee@samsung.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-16 11:48:14 +0000 |
| commit | 1b99b4ab5e12bd9e1e420aeb03da9b8c3d1b5310 (patch) | |
| tree | db3003a05b5c53c374524e6c67e0195e58699821 /third_party/tcmalloc | |
| parent | eea7d3329f73fb6470bfd7c1b4a4690111abb6c9 (diff) | |
| download | chromium_src-1b99b4ab5e12bd9e1e420aeb03da9b8c3d1b5310.zip chromium_src-1b99b4ab5e12bd9e1e420aeb03da9b8c3d1b5310.tar.gz chromium_src-1b99b4ab5e12bd9e1e420aeb03da9b8c3d1b5310.tar.bz2 | |
Fix build error with tcmalloc for android
malloc_usable_size has been changed in android ndk header.
(https://code.google.com/p/android/issues/detail?id=55725)
so to override the function properly, this header should be changed too.
BUG= 162208
Review URL: https://codereview.chromium.org/284843002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270993 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/tcmalloc')
| -rw-r--r-- | third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h b/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h index 3b858ca..2204dfd 100644 --- a/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h +++ b/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h @@ -94,7 +94,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 |