generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 9c95cbf7: Merge "Really fix the build."

Browse Source 
* commit '9c95cbf75094c15d251bb3d57a55ce47d7c6c2c8':
  Really fix the build.
This commit is contained in:
David 'Digit' Turner 2011-07-06 10:27:49 -07:00 committed by Android Git Automerger
commit b3773e9cc8
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libc/Android.mk
View File

@ -480,7 +480,8 @@ libc_common_cflags := \
-DINET6 \ -DINET6 \
-I$(LOCAL_PATH)/private \ -I$(LOCAL_PATH)/private \
-DUSE_DL_PREFIX \ -DUSE_DL_PREFIX \
-DPOSIX_MISTAKE -DPOSIX_MISTAKE \
-DLOG_ON_HEAP_ERROR \
# these macro definitions are required to implement the # these macro definitions are required to implement the
# 'timezone' and 'daylight' global variables, as well as # 'timezone' and 'daylight' global variables, as well as

6
libc/bionic/dlmalloc.c
View File

@ -2270,7 +2270,7 @@ static void reset_on_error(mstate m);
* was detected. We need to be careful about not using a log function * was detected. We need to be careful about not using a log function
* that may require an allocation here! * that may require an allocation here!
*/ */
#ifdef __ANDROID__ #ifdef LOG_ON_HEAP_ERROR
# include <private/logd.h> # 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__) __bionic_heap_error("INVALID HEAP ADDRESS", __FUNCTION__)
# endif # endif
#else /* !__ANDROID__ */ #else /* !LOG_ON_HEAP_ERROR */
# ifndef CORRUPTION_ERROR_ACTION # ifndef CORRUPTION_ERROR_ACTION
# define CORRUPTION_ERROR_ACTION(m) ABORT # 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 # define USAGE_ERROR_ACTION(m,p) ABORT
# endif /* USAGE_ERROR_ACTION */ # endif /* USAGE_ERROR_ACTION */
#endif /* !__ANDROID__ */ #endif /* !LOG_ON_HEAP_ERROR */
#endif /* PROCEED_ON_ERROR */ #endif /* PROCEED_ON_ERROR */