summaryrefslogtreecommitdiff
path: root/runtime/gc/allocator/dlmalloc.h
diff options
context:
space:
mode:
author Andreas Gampe <agampe@google.com> 2015-07-30 08:57:50 -0700
committer Andreas Gampe <agampe@google.com> 2015-07-30 08:57:50 -0700
commitc60e1b755c5632dfeb04c333489ede52ee5c945f (patch)
tree9582a0ffc99e4ad11dcd5d95dd97b09bc6acc5bf /runtime/gc/allocator/dlmalloc.h
parent7b926cdacc2b67241bc9cb5f2d4b04b13ca79d0e (diff)
ART: Use __ANDROID__ instead of HAVE_ANDROID_OS
Use the proper define. Change-Id: I71e291ac25f5d5f0187ac9b6ef2d6872f19e6085
Diffstat (limited to 'runtime/gc/allocator/dlmalloc.h')
-rw-r--r--runtime/gc/allocator/dlmalloc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/gc/allocator/dlmalloc.h b/runtime/gc/allocator/dlmalloc.h
index 0e91a4372c..0558921a56 100644
--- a/runtime/gc/allocator/dlmalloc.h
+++ b/runtime/gc/allocator/dlmalloc.h
@@ -35,7 +35,7 @@
#include "../../bionic/libc/upstream-dlmalloc/malloc.h"
#pragma GCC diagnostic pop
-#ifdef HAVE_ANDROID_OS
+#ifdef __ANDROID__
// Define dlmalloc routines from bionic that cannot be included directly because of redefining
// symbols from the include above.
extern "C" void dlmalloc_inspect_all(void(*handler)(void*, void *, size_t, void*), void* arg);