Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(641)

Unified Diff: third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h

Issue 284843002: Fix build error with tcmalloc for android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h
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 3b858caa444261e5d36e6586fb3f39eb46c29907..2204dfd50738808af959a9ef9b33ac2620a83a85 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698