diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/base/process/memory_linux.cc | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/base/process/memory_linux.cc')
| -rw-r--r-- | chromium/base/process/memory_linux.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chromium/base/process/memory_linux.cc b/chromium/base/process/memory_linux.cc index 6a6091a6047..ac8ffe1c243 100644 --- a/chromium/base/process/memory_linux.cc +++ b/chromium/base/process/memory_linux.cc @@ -132,11 +132,11 @@ bool UncheckedMalloc(size_t size, void** result) { #if BUILDFLAG(USE_ALLOCATOR_SHIM) *result = allocator::UncheckedAlloc(size); #elif defined(MEMORY_TOOL_REPLACES_ALLOCATOR) || \ - (!defined(LIBC_GLIBC) && !defined(USE_TCMALLOC)) + (!defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC)) *result = malloc(size); -#elif defined(LIBC_GLIBC) && !defined(USE_TCMALLOC) +#elif defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC) *result = __libc_malloc(size); -#elif defined(USE_TCMALLOC) +#elif BUILDFLAG(USE_TCMALLOC) *result = tc_malloc_skip_new_handler(size); #endif return *result != nullptr; |