am 71619f13: am 604f52e3: Reconcile with AOSP master

* commit '71619f13956e44c1b8cb18ddb29bd2522020a7f8':
This commit is contained in:
Jean-Baptiste Queru 2011-10-28 15:41:59 +00:00 committed by Android Git Automerger
commit 4ef824e948

View file

@ -79,7 +79,6 @@ extern "C" {
#else #else
#define LOGV(...) ((void)LOG(LOG_VERBOSE, LOG_TAG, __VA_ARGS__)) #define LOGV(...) ((void)LOG(LOG_VERBOSE, LOG_TAG, __VA_ARGS__))
#endif #endif
#define ALOGV LOGV
#endif #endif
#define CONDITION(cond) (__builtin_expect((cond)!=0, 0)) #define CONDITION(cond) (__builtin_expect((cond)!=0, 0))
@ -93,7 +92,6 @@ extern "C" {
? ((void)LOG(LOG_VERBOSE, LOG_TAG, __VA_ARGS__)) \ ? ((void)LOG(LOG_VERBOSE, LOG_TAG, __VA_ARGS__)) \
: (void)0 ) : (void)0 )
#endif #endif
#define ALOGV_IF LOGV_IF
#endif #endif
/* /*
@ -164,7 +162,6 @@ extern "C" {
#else #else
#define IF_LOGV() IF_LOG(LOG_VERBOSE, LOG_TAG) #define IF_LOGV() IF_LOG(LOG_VERBOSE, LOG_TAG)
#endif #endif
#define IF_ALOGV IF_LOGV
#endif #endif
/* /*