summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Fergeau <cfergeau@redhat.com>2012-10-01 20:37:04 +0200
committerChristophe Fergeau <cfergeau@redhat.com>2012-10-01 20:37:04 +0200
commit7f8905e58a5f99221064cb8061583aae2cad22e8 (patch)
tree6b9a53e8bbc9217fd2834642733d6c83cf2947ef
parentd958fc100c0d14c8f55016df417c7587f670b037 (diff)
downloadspice-7f8905e58a5f99221064cb8061583aae2cad22e8.tar.gz
spice-7f8905e58a5f99221064cb8061583aae2cad22e8.tar.xz
spice-7f8905e58a5f99221064cb8061583aae2cad22e8.zip
Fix PlaybackChannel forward declaration
This caused a jenkins build failure: snd_worker.c:148: error: redefinition of typedef 'PlaybackChannel' snd_worker.c:126: note: previous declaration of 'PlaybackChannel' was here
-rw-r--r--server/snd_worker.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/server/snd_worker.c b/server/snd_worker.c
index 6034aec0..a12397eb 100644
--- a/server/snd_worker.c
+++ b/server/snd_worker.c
@@ -122,7 +122,6 @@ struct SndChannel {
snd_channel_cleanup_channel_proc cleanup;
};
-struct PlaybackChannel;
typedef struct PlaybackChannel PlaybackChannel;
typedef struct AudioFrame AudioFrame;
@@ -133,7 +132,7 @@ struct AudioFrame {
AudioFrame *next;
};
-typedef struct PlaybackChannel {
+struct PlaybackChannel {
SndChannel base;
AudioFrame frames[3];
AudioFrame *free_frames;
@@ -145,7 +144,7 @@ typedef struct PlaybackChannel {
struct {
uint8_t celt_buf[CELT_COMPRESSED_FRAME_BYTES];
} send_data;
-} PlaybackChannel;
+};
struct SndWorker {
RedChannel *base_channel;