diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2011-07-06 13:00:03 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2011-07-06 13:00:05 -0700 |
| commit | 681c4bd782369e0d42bd02d3ac38a8031270ad7e (patch) | |
| tree | e2a6eb8ea379c07143343938504d9a01e75421b7 | |
| parent | cb5529efd80bc9ae78a8ea5f16f062adda4ec368 (diff) | |
| parent | b3773e9cc84630fced2117bb57224f0e766c5a26 (diff) | |
| download | bionic-681c4bd782369e0d42bd02d3ac38a8031270ad7e.zip bionic-681c4bd782369e0d42bd02d3ac38a8031270ad7e.tar.gz bionic-681c4bd782369e0d42bd02d3ac38a8031270ad7e.tar.bz2 | |
Merge b3773e9c
Change-Id: I5787d9ac5e745a08e1c891e9ce9efc4e7f97ace8
| -rw-r--r-- | libc/Android.mk | 3 | ||||
| -rw-r--r-- | libc/bionic/dlmalloc.c | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/libc/Android.mk b/libc/Android.mk index ef0ee47..2cd9e55 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -480,7 +480,8 @@ libc_common_cflags := \ -DINET6 \ -I$(LOCAL_PATH)/private \ -DUSE_DL_PREFIX \ - -DPOSIX_MISTAKE + -DPOSIX_MISTAKE \ + -DLOG_ON_HEAP_ERROR \ # these macro definitions are required to implement the # 'timezone' and 'daylight' global variables, as well as diff --git a/libc/bionic/dlmalloc.c b/libc/bionic/dlmalloc.c index 9aab1b7..8c75e9c 100644 --- a/libc/bionic/dlmalloc.c +++ b/libc/bionic/dlmalloc.c @@ -2270,7 +2270,7 @@ static void reset_on_error(mstate m); * was detected. We need to be careful about not using a log function * that may require an allocation here! */ -#ifdef __ANDROID__ +#ifdef LOG_ON_HEAP_ERROR # include <private/logd.h> @@ -2300,7 +2300,7 @@ static void __bionic_heap_error(const char* msg, const char* function) __bionic_heap_error("INVALID HEAP ADDRESS", __FUNCTION__) # endif -#else /* !__ANDROID__ */ +#else /* !LOG_ON_HEAP_ERROR */ # ifndef CORRUPTION_ERROR_ACTION # define CORRUPTION_ERROR_ACTION(m) ABORT @@ -2310,7 +2310,7 @@ static void __bionic_heap_error(const char* msg, const char* function) # define USAGE_ERROR_ACTION(m,p) ABORT # endif /* USAGE_ERROR_ACTION */ -#endif /* !__ANDROID__ */ +#endif /* !LOG_ON_HEAP_ERROR */ #endif /* PROCEED_ON_ERROR */ |