[Spice-commits] server/snd_worker.c

[Christophe Fergau]

 server/snd_worker.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 7f8905e58a5f99221064cb8061583aae2cad22e8
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Mon Oct 1 20:37:04 2012 +0200

    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

diff --git a/server/snd_worker.c b/server/snd_worker.c
index 6034aec..a12397e 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;