diff options
| author | Steve Block <steveblock@google.com> | 2012-01-09 18:31:54 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2012-01-10 21:13:57 +0000 |
| commit | ceabb17306f4de9850516dae96bb0d2d5853f028 (patch) | |
| tree | 26a55a91c32ebef187c74260fef49925a6ef18ee /include | |
| parent | 8f2e8b0a45fca6db949a631e508ec279dbe34047 (diff) | |
| download | system_core-ceabb17306f4de9850516dae96bb0d2d5853f028.tar.gz system_core-ceabb17306f4de9850516dae96bb0d2d5853f028.tar.bz2 system_core-ceabb17306f4de9850516dae96bb0d2d5853f028.zip | |
Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE
Bug: 5449033
Change-Id: I991dc84c366d8f33e5439894c23df561bbc50b83
Diffstat (limited to 'include')
| -rw-r--r-- | include/cutils/log.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/include/cutils/log.h b/include/cutils/log.h index 51239019..878952e0 100644 --- a/include/cutils/log.h +++ b/include/cutils/log.h @@ -329,10 +329,9 @@ extern "C" { * Assertion that generates a log message when the assertion fails. * Stripped out of release builds. Uses the current LOG_TAG. */ -#ifndef LOG_ASSERT -#define LOG_ASSERT(cond, ...) LOG_FATAL_IF(!(cond), ## __VA_ARGS__) -//#define LOG_ASSERT(cond) LOG_FATAL_IF(!(cond), "Assertion failed: " #cond) -#define ALOG_ASSERT LOG_ASSERT +#ifndef ALOG_ASSERT +#define ALOG_ASSERT(cond, ...) LOG_FATAL_IF(!(cond), ## __VA_ARGS__) +//#define ALOG_ASSERT(cond) LOG_FATAL_IF(!(cond), "Assertion failed: " #cond) #endif // --------------------------------------------------------------------- @@ -425,7 +424,7 @@ typedef enum { __android_log_vprint(prio, tag, fmt) /* XXX Macros to work around syntax errors in places where format string - * arg is not passed to LOG_ASSERT, LOG_ALWAYS_FATAL or LOG_ALWAYS_FATAL_IF + * arg is not passed to ALOG_ASSERT, LOG_ALWAYS_FATAL or LOG_ALWAYS_FATAL_IF * (happens only in debug builds). */ |