From e80a4ccd2bac7bf121441e257044f5813e85180f Mon Sep 17 00:00:00 2001 From: Glenn Kasten Date: Thu, 15 Dec 2011 09:51:17 -0800 Subject: Use the standard CC_LIKELY and CC_UNLIKELY macros Several source files privately defined macros LIKELY and UNLIKELY in terms of __builtin_expect. But already has CC_LIKELY and CC_UNLIKELY which are intended for this purpose. So rename the private uses to use the standard names. In addition, AudioFlinger was relying on the macro expanding to extra ( ). Change-Id: I2494e087a0c0cac0ac998335f5e9c8ad02955873 --- libs/gui/ISurfaceComposerClient.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'libs/gui/ISurfaceComposerClient.cpp') diff --git a/libs/gui/ISurfaceComposerClient.cpp b/libs/gui/ISurfaceComposerClient.cpp index ace16aaae47c..5ebdbd95587b 100644 --- a/libs/gui/ISurfaceComposerClient.cpp +++ b/libs/gui/ISurfaceComposerClient.cpp @@ -42,9 +42,6 @@ #define AID_GRAPHICS 1003 #endif -#define LIKELY( exp ) (__builtin_expect( (exp) != 0, true )) -#define UNLIKELY( exp ) (__builtin_expect( (exp) != 0, false )) - // --------------------------------------------------------------------------- namespace android { -- cgit v1.2.3-59-g8ed1b