[Spice-commits] server/main-channel-client.h server/main-channel.h

[Frediano Ziglio]

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

New commits:
commit 177c331c53874109c404a4aa65e83aa595188bb2
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Thu Oct 20 13:00:25 2016 +0100

    Avoid to typedef twice MainChannel
    
    MainChannel is already defined in main-channel.h.
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Jonathon Jongsma <jjongsma at redhat.com>

diff --git a/server/main-channel-client.h b/server/main-channel-client.h
index 360c61e..14fb419 100644
--- a/server/main-channel-client.h
+++ b/server/main-channel-client.h
@@ -21,12 +21,10 @@
 #include <common/messages.h>
 
 #include "red-channel-client.h"
+#include "main-channel.h"
 
 G_BEGIN_DECLS
 
-/* FIXME: remove extra MainChannel typedef when possible */
-typedef struct MainChannel MainChannel;
-
 #define TYPE_MAIN_CHANNEL_CLIENT main_channel_client_get_type()
 
 #define MAIN_CHANNEL_CLIENT(obj) \
diff --git a/server/main-channel.h b/server/main-channel.h
index 73c8a94..6e89f14 100644
--- a/server/main-channel.h
+++ b/server/main-channel.h
@@ -23,7 +23,6 @@
 #include <common/marshaller.h>
 
 #include "red-channel.h"
-#include "main-channel-client.h"
 
 #define MAIN_CHANNEL(channel) ((MainChannel*)(channel))