diff options
| author | Abseil Team <absl-team@google.com> | 2018-04-03T21·52-0700 |
|---|---|---|
| committer | Ashley Hedberg <ahedberg@google.com> | 2018-04-04T14·42-0400 |
| commit | abd0824ba64094e860803730c44d985334ad8770 (patch) | |
| tree | 931fa56029c46926bf5cae2c0db3c34140ef8e38 /absl | |
| parent | 0e5c3e8f161c004e3384d7e07eb0e6e0ac834fb6 (diff) | |
- 985074b3d2f08388125a0004a4984f1d64fb0fcf In the internal implementation, avoid conflicting definit... by Abseil Team <absl-team@google.com>
GitOrigin-RevId: 985074b3d2f08388125a0004a4984f1d64fb0fcf Change-Id: I1a564ac086a36bb52d36aeb5f500c7099d2ee032
Diffstat (limited to 'absl')
| -rw-r--r-- | absl/base/internal/malloc_hook.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/absl/base/internal/malloc_hook.cc b/absl/base/internal/malloc_hook.cc index e7b626df125b..c364d3ffd21d 100644 --- a/absl/base/internal/malloc_hook.cc +++ b/absl/base/internal/malloc_hook.cc @@ -539,7 +539,8 @@ int MallocHook::GetCallerStackTrace(void** result, int max_depth, // msan config; Replace MALLOC_HOOK_MMAP_DISABLE with // ABSL_MALLOC_HOOK_MMAP_DISABLE for other special cases. #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" #elif ABSL_HAVE_MMAP |