diff options
| author | Steve Block <steveblock@google.com> | 2012-01-05 22:25:38 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2012-01-17 17:56:20 +0000 |
| commit | 4f07a1f826ddb3669c8da2b2a92983f01df43d54 (patch) | |
| tree | 8b152c34995613939f0a16426107e3bfa6e70e28 /include | |
| parent | 4163b45949c0382f0370bc2a25fcbb6c07c4c5eb (diff) | |
| download | system_core-4f07a1f826ddb3669c8da2b2a92983f01df43d54.tar.gz system_core-4f07a1f826ddb3669c8da2b2a92983f01df43d54.tar.bz2 system_core-4f07a1f826ddb3669c8da2b2a92983f01df43d54.zip | |
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
Change-Id: I6c2a1d56dadb7e5c69e478f4d8c7d9f2127db2af
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 7d194409..4e6a57d4 100644 --- a/include/cutils/log.h +++ b/include/cutils/log.h @@ -149,17 +149,23 @@ extern "C" { /* * Simplified macro to send a warning log message using the current LOG_TAG. */ +#ifndef ALOGW +#define ALOGW(...) ((void)ALOG(LOG_WARN, LOG_TAG, __VA_ARGS__)) +// Temporary measure for code still using old LOG macros. #ifndef LOGW -#define LOGW(...) ((void)ALOG(LOG_WARN, LOG_TAG, __VA_ARGS__)) -#define ALOGW LOGW +#define LOGW ALOGW +#endif #endif -#ifndef LOGW_IF -#define LOGW_IF(cond, ...) \ +#ifndef ALOGW_IF +#define ALOGW_IF(cond, ...) \ ( (CONDITION(cond)) \ ? ((void)ALOG(LOG_WARN, LOG_TAG, __VA_ARGS__)) \ : (void)0 ) -#define ALOGW_IF LOGW_IF +// Temporary measure for code still using old LOG macros. +#ifndef LOGW_IF +#define LOGW_IF ALOGW_IF +#endif #endif /* @@ -224,9 +230,12 @@ extern "C" { * Conditional based on whether the current LOG_TAG is enabled at * warn priority. */ +#ifndef IF_ALOGW +#define IF_ALOGW() IF_ALOG(LOG_WARN, LOG_TAG) +// Temporary measure for code still using old LOG macros. #ifndef IF_LOGW -#define IF_LOGW() IF_ALOG(LOG_WARN, LOG_TAG) -#define IF_ALOGW IF_LOGW +#define IF_LOGW IF_ALOGW +#endif #endif /* |