maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- 985074b3d2f08388125a0004a4984f1d64fb0fcf In the internal implementation, avoid conflicting definit... by Abseil Team <absl-team@google.com>

Browse source 
GitOrigin-RevId: 985074b3d2f08388125a0004a4984f1d64fb0fcf
Change-Id: I1a564ac086a36bb52d36aeb5f500c7099d2ee032
This commit is contained in:
Abseil Team 2018-04-03 14:52:04 -07:00 • committed by Ashley Hedberg
parent 0e5c3e8f16
commit abd0824ba6
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
absl/base/internal/malloc_hook.cc
View file

@ -539,7 +539,8 @@ int MallocHook::GetCallerStackTrace(void** result, int max_depth,
// msan config; Replace MALLOC_HOOK_MMAP_DISABLE with // msan config; Replace MALLOC_HOOK_MMAP_DISABLE with
// ABSL_MALLOC_HOOK_MMAP_DISABLE for other special cases. // ABSL_MALLOC_HOOK_MMAP_DISABLE for other special cases.
#if !defined(THREAD_SANITIZER) && !defined(MEMORY_SANITIZER) && \ #if !defined(THREAD_SANITIZER) && !defined(MEMORY_SANITIZER) && \
!defined(ABSL_MALLOC_HOOK_MMAP_DISABLE) && defined(__linux__) !defined(ABSL_MALLOC_HOOK_MMAP_DISABLE) && !defined(__ANDROID__) && \
defined(__linux__)
#include "absl/base/internal/malloc_hook_mmap_linux.inc" #include "absl/base/internal/malloc_hook_mmap_linux.inc"
#elif ABSL_HAVE_MMAP #elif ABSL_HAVE_MMAP