summaryrefslogtreecommitdiff
path: root/libs/gui/ISurfaceComposerClient.cpp
diff options
context:
space:
mode:
author Glenn Kasten <gkasten@google.com> 2011-12-15 09:51:17 -0800
committer Glenn Kasten <gkasten@google.com> 2012-01-05 07:33:45 -0800
commite80a4ccd2bac7bf121441e257044f5813e85180f (patch)
tree795c33992f702be01aac2ffbfb652408168d9b26 /libs/gui/ISurfaceComposerClient.cpp
parent7c48707a9d320230452d5937239f28ab0ea2e695 (diff)
Use the standard CC_LIKELY and CC_UNLIKELY macros
Several source files privately defined macros LIKELY and UNLIKELY in terms of __builtin_expect. But <cutils/compiler.h> 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
Diffstat (limited to 'libs/gui/ISurfaceComposerClient.cpp')
-rw-r--r--libs/gui/ISurfaceComposerClient.cpp3
1 files changed, 0 insertions, 3 deletions
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 {