[Spice-commits] 2 commits - server/cursor-channel-client.h server/stream.h

[Frediano Ziglio]

 server/cursor-channel-client.h |    2 +-
 server/stream.h                |    3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 4121547ba87b89ec4916cbda60f764ce50de5048
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Mon Oct 17 14:10:00 2016 +0100

    Do not typedef DisplayChannel twice
    
    Already defined in dcc.h.
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Pavel Grunt <pgrunt at redhat.com>

diff --git a/server/stream.h b/server/stream.h
index 77223c8..a415e43 100644
--- a/server/stream.h
+++ b/server/stream.h
@@ -42,9 +42,6 @@
 #define RED_STREAM_DEFAULT_LOW_START_BIT_RATE (2.5 * 1024 * 1024) // 2.5Mbps
 #define MAX_FPS 30
 
-/* move back to display_channel once struct private */
-typedef struct DisplayChannel DisplayChannel;
-
 typedef struct Stream Stream;
 
 typedef struct RedStreamActivateReportItem {
commit bd322b68e695347ee0325417cbad73dd7cdd7713
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Mon Oct 17 14:03:21 2016 +0100

    Avoid to typedef twice CursorChannel
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Pavel Grunt <pgrunt at redhat.com>

diff --git a/server/cursor-channel-client.h b/server/cursor-channel-client.h
index 2336b95..fab6837 100644
--- a/server/cursor-channel-client.h
+++ b/server/cursor-channel-client.h
@@ -24,6 +24,7 @@
 #include "red-common.h"
 #include "red-channel-client.h"
 #include "reds-stream.h"
+#include "cursor-channel.h"
 
 G_BEGIN_DECLS
 
@@ -43,7 +44,6 @@ G_BEGIN_DECLS
 typedef struct CursorChannelClient CursorChannelClient;
 typedef struct CursorChannelClientClass CursorChannelClientClass;
 typedef struct CursorChannelClientPrivate CursorChannelClientPrivate;
-typedef struct CursorChannel CursorChannel;
 
 struct CursorChannelClient
 {