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

Unified Diff: base/process/memory_linux.cc

Issue 184313002: only do linux pvalloc OutOfMemoryDeathTest on non-tcmalloc glibc builds (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: move ifdef for clarity Created 6 years, 10 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 | « base/process/memory.h ('k') | base/process/memory_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/process/memory_linux.cc
diff --git a/base/process/memory_linux.cc b/base/process/memory_linux.cc
index 6bed68bd8320346b1ff98a39417e604e0339b020..e5e21b3fe713d05b145f3b23d3e75219d96c674a 100644
--- a/base/process/memory_linux.cc
+++ b/base/process/memory_linux.cc
@@ -44,7 +44,9 @@ void* __libc_malloc(size_t size);
void* __libc_realloc(void* ptr, size_t size);
void* __libc_calloc(size_t nmemb, size_t size);
void* __libc_valloc(size_t size);
+#if PVALLOC_AVAILABLE == 1
void* __libc_pvalloc(size_t size);
+#endif
void* __libc_memalign(size_t alignment, size_t size);
// Overriding the system memory allocation functions:
@@ -99,7 +101,9 @@ void* __libc_memalign(size_t alignment, size_t size);
DIE_ON_OOM_1(malloc)
DIE_ON_OOM_1(valloc)
+#if PVALLOC_AVAILABLE == 1
DIE_ON_OOM_1(pvalloc)
+#endif
DIE_ON_OOM_2(calloc, size_t)
DIE_ON_OOM_2(realloc, void*)
« no previous file with comments | « base/process/memory.h ('k') | base/process/memory_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698