diff options
| author | Elliott Hughes <enh@google.com> | 2014-05-22 01:32:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-22 01:32:20 +0000 |
| commit | c0bf836f8a4e34d66c10a2bb8b8cee0db04790cc (patch) | |
| tree | b7bb591c3e6f1beb8763f6efb4db4c7a96d983d9 /services/audioflinger/FastMixer.h | |
| parent | b108091734ee7668084cc1063187c2b10ddb7bb7 (diff) | |
| parent | ad71caf25e31ecfc4ecf2c925e38fd87905fbc8e (diff) | |
| download | frameworks_av-c0bf836f8a4e34d66c10a2bb8b8cee0db04790cc.zip frameworks_av-c0bf836f8a4e34d66c10a2bb8b8cee0db04790cc.tar.gz frameworks_av-c0bf836f8a4e34d66c10a2bb8b8cee0db04790cc.tar.bz2 | |
am ad71caf2: am 3b6da6bf: Merge "Move frameworks/av off private API."
* commit 'ad71caf25e31ecfc4ecf2c925e38fd87905fbc8e':
Move frameworks/av off private API.
Diffstat (limited to 'services/audioflinger/FastMixer.h')
| -rw-r--r-- | services/audioflinger/FastMixer.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/services/audioflinger/FastMixer.h b/services/audioflinger/FastMixer.h index 6158925..c356d31 100644 --- a/services/audioflinger/FastMixer.h +++ b/services/audioflinger/FastMixer.h @@ -17,11 +17,10 @@ #ifndef ANDROID_AUDIO_FAST_MIXER_H #define ANDROID_AUDIO_FAST_MIXER_H +#include <linux/futex.h> +#include <sys/syscall.h> #include <utils/Debug.h> #include <utils/Thread.h> -extern "C" { -#include "../private/bionic_futex.h" -} #include "StateQueue.h" #include "FastMixerState.h" |