diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-01-05 07:38:29 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-05 07:38:29 -0800 |
| commit | 2adea706d445e837053403a00286a21c00e22649 (patch) | |
| tree | 5ea27e23f710c07d6166be3213a9de2d5be1036f /libs | |
| parent | e03e4949c07a667c9154812961375df873e5605b (diff) | |
| parent | 99ed22412db547c59d3da08114d9d5a586442b30 (diff) | |
| download | frameworks_native-2adea706d445e837053403a00286a21c00e22649.zip frameworks_native-2adea706d445e837053403a00286a21c00e22649.tar.gz frameworks_native-2adea706d445e837053403a00286a21c00e22649.tar.bz2 | |
Merge "Use the standard CC_LIKELY and CC_UNLIKELY macros"
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 { |