aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2018-10-12 00:37:49 -0700
committerDan Willemsen <dwillemsen@google.com>2018-10-22 19:29:10 +0000
commit9447c6b21bb0aa684b5bea9f74f1277058743a04 (patch)
treed9dfac14882e3092be431d7c1fe264df06f976ce /include
parenta517fc5366709135ec88172e12c44bd641ac7ebf (diff)
downloadjemalloc-9447c6b21bb0aa684b5bea9f74f1277058743a04.tar.gz
Fix settings for host bionic
Bug: 31559095 Test: attempt to build host bionic Change-Id: I9e02fcd01f3f5c23fb4a64bd13d6b0a2fb2c1dbb
Diffstat (limited to 'include')
-rw-r--r--include/jemalloc/internal/jemalloc_internal_defs.h5
-rw-r--r--include/jemalloc/jemalloc.h2
2 files changed, 5 insertions, 2 deletions
diff --git a/include/jemalloc/internal/jemalloc_internal_defs.h b/include/jemalloc/internal/jemalloc_internal_defs.h
index 9ffe26c..03d537e 100644
--- a/include/jemalloc/internal/jemalloc_internal_defs.h
+++ b/include/jemalloc/internal/jemalloc_internal_defs.h
@@ -1,4 +1,7 @@
-#if !defined(__ANDROID__)
+/* Include cdefs to see if __BIONIC__ is set */
+#include <sys/cdefs.h>
+
+#if !defined(__BIONIC__)
#include "jemalloc_internal_defs_host.h"
#else
/* include/jemalloc/internal/jemalloc_internal_defs.h. Generated from jemalloc_internal_defs.h.in by configure. */
diff --git a/include/jemalloc/jemalloc.h b/include/jemalloc/jemalloc.h
index 8f88f6d..c5dc830 100644
--- a/include/jemalloc/jemalloc.h
+++ b/include/jemalloc/jemalloc.h
@@ -64,7 +64,7 @@ extern "C" {
* these macro definitions.
*/
#ifndef JEMALLOC_NO_RENAME
-#if defined(__ANDROID__)
+#if defined(__BIONIC__)
# define je_malloc_conf je_malloc_conf
# define je_malloc_message je_malloc_message
# define je_malloc je_malloc