diff options
| author | Steve Block <steveblock@google.com> | 2012-01-06 14:13:42 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2012-01-17 17:56:20 +0000 |
| commit | 8aeb6e244a484305428ffbbc4be64d51e9bccdaa (patch) | |
| tree | ee67d277e210b19fff6c6e9f548de07143934228 /include | |
| parent | 4f07a1f826ddb3669c8da2b2a92983f01df43d54 (diff) | |
| download | system_core-8aeb6e244a484305428ffbbc4be64d51e9bccdaa.zip system_core-8aeb6e244a484305428ffbbc4be64d51e9bccdaa.tar.gz system_core-8aeb6e244a484305428ffbbc4be64d51e9bccdaa.tar.bz2 | |
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
Change-Id: I52fce957db06c281e2618daa4e2ecba19974f2eb
Diffstat (limited to 'include')
| -rw-r--r-- | include/cutils/log.h | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/include/cutils/log.h b/include/cutils/log.h index 4e6a57d..c7543fb 100644 --- a/include/cutils/log.h +++ b/include/cutils/log.h @@ -171,17 +171,23 @@ extern "C" { /* * Simplified macro to send an error log message using the current LOG_TAG. */ +#ifndef ALOGE +#define ALOGE(...) ((void)ALOG(LOG_ERROR, LOG_TAG, __VA_ARGS__)) +// Temporary measure for code still using old LOG macros. #ifndef LOGE -#define LOGE(...) ((void)ALOG(LOG_ERROR, LOG_TAG, __VA_ARGS__)) -#define ALOGE LOGE +#define LOGE ALOGE +#endif #endif -#ifndef LOGE_IF -#define LOGE_IF(cond, ...) \ +#ifndef ALOGE_IF +#define ALOGE_IF(cond, ...) \ ( (CONDITION(cond)) \ ? ((void)ALOG(LOG_ERROR, LOG_TAG, __VA_ARGS__)) \ : (void)0 ) -#define ALOGE_IF LOGE_IF +// Temporary measure for code still using old LOG macros. +#ifndef LOGE_IF +#define LOGE_IF ALOGE_IF +#endif #endif // --------------------------------------------------------------------- @@ -242,9 +248,12 @@ extern "C" { * Conditional based on whether the current LOG_TAG is enabled at * error priority. */ +#ifndef IF_ALOGE +#define IF_ALOGE() IF_ALOG(LOG_ERROR, LOG_TAG) +// Temporary measure for code still using old LOG macros. #ifndef IF_LOGE -#define IF_LOGE() IF_ALOG(LOG_ERROR, LOG_TAG) -#define IF_ALOGE IF_LOGE +#define IF_LOGE IF_ALOGE +#endif #endif |