Commit 958e3693 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/pull-audio-20160202-1' into staging 



audio: Clean up includes

# gpg: Signature made Tue 02 Feb 2016 12:58:06 GMT using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/kraxel/tags/pull-audio-20160202-1:
  audio: Clean up includes

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents dce0238c 6086a565

audio/alsaaudio.c

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 * THE SOFTWARE.

 */

#include "qemu/osdep.h"

#include <alsa/asoundlib.h>

#include "qemu-common.h"

#include "qemu/main-loop.h"

audio/audio.c

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 * THE SOFTWARE.

 */

#include "qemu/osdep.h"

#include "hw/hw.h"

#include "audio.h"

#include "monitor/monitor.h"

audio/audio_pt_int.c

+1 −0
Original line number Diff line number Diff line 
#include "qemu/osdep.h"

#include "qemu-common.h"

#include "audio.h"

audio/audio_win_int.c

+1 −0
Original line number Diff line number Diff line 
/* public domain */



#include "qemu/osdep.h"

#include "qemu-common.h"



#define AUDIO_CAP "win-int"

audio/coreaudio.c

+1 −1
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ 
 * THE SOFTWARE.

 */



#include "qemu/osdep.h"

#include <CoreAudio/CoreAudio.h>

#include <string.h>             /* strerror */

#include <pthread.h>            /* pthread_X */



#include "qemu-common.h"