commit ae8b56c0d17a97aff0b98e6405c7cc9811bbbc3d
author Steve Block <steveblock@google.com> Thu Jan 05 22:25:38 2012 +0000
committer Steve Block <steveblock@google.com> Thu Jan 05 22:25:38 2012 +0000
tree f860c0f93c3b1e49c97912f31458fcfd79ba8602
parent fe71a61e5b0cb666675900d206251a7c18ed944b

Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)  DO NOT MERGE

Bug: 5449033
Change-Id: I1e070511b6a538e9f1c94657356437a457d58882

include/cutils/log.h

diff --git a/include/cutils/log.h b/include/cutils/log.h
index 9a2ad63..fe0eb02 100644
--- a/include/cutils/log.h
+++ b/include/cutils/log.h
@@ -125,12 +125,12 @@
 /*
  * Simplified macro to send a warning log message using the current LOG_TAG.
  */
-#ifndef LOGW
-#define LOGW(...) ((void)ALOG(LOG_WARN, LOG_TAG, __VA_ARGS__))
+#ifndef ALOGW
+#define ALOGW(...) ((void)ALOG(LOG_WARN, LOG_TAG, __VA_ARGS__))
 #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 )
@@ -184,8 +184,8 @@
  * Conditional based on whether the current LOG_TAG is enabled at
  * warn priority.
  */
-#ifndef IF_LOGW
-#define IF_LOGW() IF_ALOG(LOG_WARN, LOG_TAG)
+#ifndef IF_ALOGW
+#define IF_ALOGW() IF_ALOG(LOG_WARN, LOG_TAG)
 #endif
 
 /*