diff options
| author | Elliott Hughes <enh@google.com> | 2014-05-21 18:47:50 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-05-21 18:47:50 -0700 |
| commit | e348c5b72ad889389c7c1c900c121f0fbee221b5 (patch) | |
| tree | 9c77581ad7520309c0bb90f11bba766a6cd61b28 /services/audioflinger/FastMixer.h | |
| parent | 9382378b6b271949bdce527ea3da748c13c4c692 (diff) | |
| parent | c0bf836f8a4e34d66c10a2bb8b8cee0db04790cc (diff) | |
| download | frameworks_av-e348c5b72ad889389c7c1c900c121f0fbee221b5.zip frameworks_av-e348c5b72ad889389c7c1c900c121f0fbee221b5.tar.gz frameworks_av-e348c5b72ad889389c7c1c900c121f0fbee221b5.tar.bz2 | |
resolved conflicts for merge of c0bf836f to master
Change-Id: I5cf238fa56d6fff443b212870cf9dd7f1110e7da
Diffstat (limited to 'services/audioflinger/FastMixer.h')
| -rw-r--r-- | services/audioflinger/FastMixer.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/services/audioflinger/FastMixer.h b/services/audioflinger/FastMixer.h index 981c1a7..db89ef4 100644 --- a/services/audioflinger/FastMixer.h +++ b/services/audioflinger/FastMixer.h @@ -17,13 +17,11 @@ #ifndef ANDROID_AUDIO_FAST_MIXER_H #define ANDROID_AUDIO_FAST_MIXER_H +#include <linux/futex.h> +#include <sys/syscall.h> #include <utils/Debug.h> -#if 1 // FIXME move to where used -extern "C" { -#include "../private/bionic_futex.h" -} -#endif #include "FastThread.h" +#include <utils/Thread.h> #include "StateQueue.h" #include "FastMixerState.h" #include "FastMixerDumpState.h" |