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 | f6b1678f8f508b447155a81b44e214475ab634a8 (patch) | |
| tree | dabe2858dfed9133c6a270cd6b86877a9d3588b1 /services/audioflinger/AudioMixer.h | |
| parent | 94023fa6744e24f26f0aba1699ec278649bd66df (diff) | |
| download | frameworks_av-f6b1678f8f508b447155a81b44e214475ab634a8.zip frameworks_av-f6b1678f8f508b447155a81b44e214475ab634a8.tar.gz frameworks_av-f6b1678f8f508b447155a81b44e214475ab634a8.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 'services/audioflinger/AudioMixer.h')
| -rw-r--r-- | services/audioflinger/AudioMixer.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/services/audioflinger/AudioMixer.h b/services/audioflinger/AudioMixer.h index 70464fc..05f405f 100644 --- a/services/audioflinger/AudioMixer.h +++ b/services/audioflinger/AudioMixer.h @@ -28,11 +28,6 @@ namespace android { // ---------------------------------------------------------------------------- -#define LIKELY( exp ) (__builtin_expect( (exp) != 0, true )) -#define UNLIKELY( exp ) (__builtin_expect( (exp) != 0, false )) - -// ---------------------------------------------------------------------------- - class AudioMixer { public: |