summaryrefslogtreecommitdiffstats
path: root/services/audioflinger/AudioMixer.h
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2012-01-05 07:38:29 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-01-05 07:38:29 -0800
commita2a0a5d7d56baa831870f4bf2a0d942a477d92ef (patch)
tree1979692770dd902d0aa7e8c0760e496e13539e5c /services/audioflinger/AudioMixer.h
parent7ab41c9f773ba599646f1b0d00955c1be80f92fd (diff)
parentf6b1678f8f508b447155a81b44e214475ab634a8 (diff)
downloadframeworks_av-a2a0a5d7d56baa831870f4bf2a0d942a477d92ef.zip
frameworks_av-a2a0a5d7d56baa831870f4bf2a0d942a477d92ef.tar.gz
frameworks_av-a2a0a5d7d56baa831870f4bf2a0d942a477d92ef.tar.bz2
Merge "Use the standard CC_LIKELY and CC_UNLIKELY macros"
Diffstat (limited to 'services/audioflinger/AudioMixer.h')
-rw-r--r--services/audioflinger/AudioMixer.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/services/audioflinger/AudioMixer.h b/services/audioflinger/AudioMixer.h
index 8ba5073..9c129b8 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: