diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2009-09-12 07:36:22 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2009-09-12 07:36:22 +0000 |
| commit | 72cf2d4f0e181d0d3a3122e04129c58a95da713e (patch) | |
| tree | 4d13c505a692104406090e94dd654fd1e98ec34e /audio/audio.h | |
| parent | 620150dc9c1827cdddfa64a0fada7af5f7ee405b (diff) | |
Fix sys-queue.h conflict for good
Problem: Our file sys-queue.h is a copy of the BSD file, but there are
some additions and it's not entirely compatible. Because of that, there have
been conflicts with system headers on BSD systems. Some hacks have been
introduced in the commits 15cc9235840a22c289edbe064a9b3c19c5f49896,
f40d753718c72693c5f520f0d9899f6e50395e94,
96555a96d724016e13190b28cffa3bc929ac60dc and
3990d09adf4463eca200ad964cc55643c33feb50 but the fixes were fragile.
Solution: Avoid the conflict entirely by renaming the functions and the
file. Revert the previous hacks.
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'audio/audio.h')
| -rw-r--r-- | audio/audio.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/audio/audio.h b/audio/audio.h index dec86e5f77..f234ad0f54 100644 --- a/audio/audio.h +++ b/audio/audio.h @@ -25,7 +25,7 @@ #define QEMU_AUDIO_H #include "config-host.h" -#include "sys-queue.h" +#include "qemu-queue.h" typedef void (*audio_callback_fn_t) (void *opaque, int avail); @@ -70,7 +70,7 @@ struct capture_ops { typedef struct CaptureState { void *opaque; struct capture_ops ops; - LIST_ENTRY (CaptureState) entries; + QLIST_ENTRY (CaptureState) entries; } CaptureState; typedef struct SWVoiceOut SWVoiceOut; @@ -79,7 +79,7 @@ typedef struct SWVoiceIn SWVoiceIn; typedef struct QEMUSoundCard { char *name; - LIST_ENTRY (QEMUSoundCard) entries; + QLIST_ENTRY (QEMUSoundCard) entries; } QEMUSoundCard; typedef struct QEMUAudioTimeStamp { |