aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2011-12-20 16:07:45 +0000
committerSteve Block <steveblock@google.com>2012-01-17 17:56:19 +0000
commit9786ec417ffd59e15b1c659862521e8da21d185d (patch)
treee9999c1c9efa5487ce80f0ca133b535aeeaac59f /include
parent66b68757f680ac9262e46f3c7b8cb748c7d99f05 (diff)
downloadsystem_core-9786ec417ffd59e15b1c659862521e8da21d185d.tar.gz
system_core-9786ec417ffd59e15b1c659862521e8da21d185d.tar.bz2
system_core-9786ec417ffd59e15b1c659862521e8da21d185d.zip
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
Change-Id: Ia0476219b71ece949595515ee07ea072ed349d73
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 fe711efa..121e350f 100644
--- a/include/cutils/log.h
+++ b/include/cutils/log.h
@@ -105,17 +105,23 @@ extern "C" {
/*
* Simplified macro to send a debug log message using the current LOG_TAG.
*/
+#ifndef ALOGD
+#define ALOGD(...) ((void)ALOG(LOG_DEBUG, LOG_TAG, __VA_ARGS__))
+// Temporary measure for code still using old LOG macros.
#ifndef LOGD
-#define LOGD(...) ((void)ALOG(LOG_DEBUG, LOG_TAG, __VA_ARGS__))
-#define ALOGD LOGD
+#define LOGD ALOGD
+#endif
#endif
-#ifndef LOGD_IF
-#define LOGD_IF(cond, ...) \
+#ifndef ALOGD_IF
+#define ALOGD_IF(cond, ...) \
( (CONDITION(cond)) \
? ((void)ALOG(LOG_DEBUG, LOG_TAG, __VA_ARGS__)) \
: (void)0 )
-#define ALOGD_IF LOGD_IF
+// Temporary measure for code still using old LOG macros.
+#ifndef LOGD_IF
+#define LOGD_IF ALOGD_IF
+#endif
#endif
/*
@@ -188,9 +194,12 @@ extern "C" {
* Conditional based on whether the current LOG_TAG is enabled at
* debug priority.
*/
+#ifndef IF_ALOGD
+#define IF_ALOGD() IF_ALOG(LOG_DEBUG, LOG_TAG)
+// Temporary measure for code still using old LOG macros.
#ifndef IF_LOGD
-#define IF_LOGD() IF_ALOG(LOG_DEBUG, LOG_TAG)
-#define IF_ALOGD IF_LOGD
+#define IF_LOGD IF_ALOGD
+#endif
#endif
/*