aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2012-01-04 19:19:03 +0000
committerSteve Block <steveblock@google.com>2012-01-17 17:56:19 +0000
commit4163b45949c0382f0370bc2a25fcbb6c07c4c5eb (patch)
tree0099e8bd716395b471da920f8cef43a02c59b403 /include
parent9786ec417ffd59e15b1c659862521e8da21d185d (diff)
downloadsystem_core-4163b45949c0382f0370bc2a25fcbb6c07c4c5eb.tar.gz
system_core-4163b45949c0382f0370bc2a25fcbb6c07c4c5eb.tar.bz2
system_core-4163b45949c0382f0370bc2a25fcbb6c07c4c5eb.zip
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
Change-Id: I929ea38bc6fe6efeefa7870c8e7e4c19cd0029b3
Diffstat (limited to 'include')
-rw-r--r--include/cutils/log.h23
1 files changed, 16 insertions, 7 deletions
diff --git a/include/cutils/log.h b/include/cutils/log.h
index 121e350f..7d194409 100644
--- a/include/cutils/log.h
+++ b/include/cutils/log.h
@@ -127,17 +127,23 @@ extern "C" {
/*
* Simplified macro to send an info log message using the current LOG_TAG.
*/
+#ifndef ALOGI
+#define ALOGI(...) ((void)ALOG(LOG_INFO, LOG_TAG, __VA_ARGS__))
+// Temporary measure for code still using old LOG macros.
#ifndef LOGI
-#define LOGI(...) ((void)ALOG(LOG_INFO, LOG_TAG, __VA_ARGS__))
-#define ALOGI LOGI
+#define LOGI ALOGI
+#endif
#endif
-#ifndef LOGI_IF
-#define LOGI_IF(cond, ...) \
+#ifndef ALOGI_IF
+#define ALOGI_IF(cond, ...) \
( (CONDITION(cond)) \
? ((void)ALOG(LOG_INFO, LOG_TAG, __VA_ARGS__)) \
: (void)0 )
-#define ALOGI_IF LOGI_IF
+// Temporary measure for code still using old LOG macros.
+#ifndef LOGI_IF
+#define LOGI_IF ALOGI_IF
+#endif
#endif
/*
@@ -206,9 +212,12 @@ extern "C" {
* Conditional based on whether the current LOG_TAG is enabled at
* info priority.
*/
+#ifndef IF_ALOGI
+#define IF_ALOGI() IF_ALOG(LOG_INFO, LOG_TAG)
+// Temporary measure for code still using old LOG macros.
#ifndef IF_LOGI
-#define IF_LOGI() IF_ALOG(LOG_INFO, LOG_TAG)
-#define IF_ALOGI IF_LOGI
+#define IF_LOGI IF_ALOGI
+#endif
#endif
/*