diff options
| 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 |
| commit | 99ed22412db547c59d3da08114d9d5a586442b30 (patch) | |
| tree | 686069701dc5e709304fe64a5437f17d461fc67d /libs | |
| parent | a91bc48fbd4a2ca744b4e4a4cfb695375f0aaf1c (diff) | |
| download | frameworks_native-99ed22412db547c59d3da08114d9d5a586442b30.zip frameworks_native-99ed22412db547c59d3da08114d9d5a586442b30.tar.gz frameworks_native-99ed22412db547c59d3da08114d9d5a586442b30.tar.bz2 | |
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')
| -rw-r--r-- | libs/gui/ISurfaceComposer.cpp | 5 | ||||
| -rw-r--r-- | libs/gui/ISurfaceComposerClient.cpp | 3 |
2 files changed, 0 insertions, 8 deletions
diff --git a/libs/gui/ISurfaceComposer.cpp b/libs/gui/ISurfaceComposer.cpp index db32827..ca7c8f8 100644 --- a/libs/gui/ISurfaceComposer.cpp +++ b/libs/gui/ISurfaceComposer.cpp @@ -40,11 +40,6 @@ // --------------------------------------------------------------------------- -#define LIKELY( exp ) (__builtin_expect( (exp) != 0, true )) -#define UNLIKELY( exp ) (__builtin_expect( (exp) != 0, false )) - -// --------------------------------------------------------------------------- - namespace android { class IDisplayEventConnection; diff --git a/libs/gui/ISurfaceComposerClient.cpp b/libs/gui/ISurfaceComposerClient.cpp index ace16aa..5ebdbd9 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 { |