diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2011-10-28 15:43:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-28 15:43:04 +0000 |
| commit | 1941c91389e8b9ba09ea6029b9d1f79abb42fe07 (patch) | |
| tree | bcea63abdadb287d0864fdd8c3f41106f4b28d41 /include/cutils | |
| parent | 4ddc88e73e43b98589bc14739acfb2428c5f9cc3 (diff) | |
| parent | 4ef824e9481625270aa065cc4d0625e8c8d9e0df (diff) | |
| download | core-1941c91389e8b9ba09ea6029b9d1f79abb42fe07.tar.gz core-1941c91389e8b9ba09ea6029b9d1f79abb42fe07.tar.bz2 core-1941c91389e8b9ba09ea6029b9d1f79abb42fe07.zip | |
am 4ef824e9: am 71619f13: am 604f52e3: Reconcile with AOSP master
* commit '4ef824e9481625270aa065cc4d0625e8c8d9e0df':
Diffstat (limited to 'include/cutils')
| -rw-r--r-- | include/cutils/log.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/cutils/log.h b/include/cutils/log.h index df6630fdf..0e6380975 100644 --- a/include/cutils/log.h +++ b/include/cutils/log.h @@ -79,7 +79,6 @@ extern "C" { #else #define ALOGV(...) ((void)ALOG(LOG_VERBOSE, LOG_TAG, __VA_ARGS__)) #endif -#define ALOGV LOGV #endif #define CONDITION(cond) (__builtin_expect((cond)!=0, 0)) @@ -93,7 +92,6 @@ extern "C" { ? ((void)ALOG(LOG_VERBOSE, LOG_TAG, __VA_ARGS__)) \ : (void)0 ) #endif -#define ALOGV_IF LOGV_IF #endif /* @@ -164,7 +162,6 @@ extern "C" { #else #define IF_ALOGV() IF_ALOG(LOG_VERBOSE, LOG_TAG) #endif -#define IF_ALOGV IF_LOGV #endif /* |