[Spice-commits] 2 commits - server/dcc.c server/main-channel.c server/red-channel-client.h server/red-qxl.c server/reds.c server/sound.c server/stream.c

[Frediano Ziglio]

 server/dcc.c                |    1 +
 server/main-channel.c       |    3 ++-
 server/red-channel-client.h |    3 ---
 server/red-qxl.c            |    1 +
 server/reds.c               |    1 +
 server/sound.c              |    1 +
 server/stream.c             |    1 +
 7 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit d38ae73683ee7c69d0df3826f4e7206fff8b0e69
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Mon Oct 17 14:18:06 2016 +0100

    Include main-channel-client.h where MainChannelClient is used
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Jonathon Jongsma <jjongsma at redhat.com>

diff --git a/server/dcc.c b/server/dcc.c
index 3519d2e..0080f10 100644
--- a/server/dcc.c
+++ b/server/dcc.c
@@ -22,6 +22,7 @@
 #include "dcc-private.h"
 #include "display-channel.h"
 #include "red-channel-client-private.h"
+#include "main-channel-client.h"
 #include "spice-server-enums.h"
 
 G_DEFINE_TYPE(DisplayChannelClient, display_channel_client, RED_TYPE_CHANNEL_CLIENT)
diff --git a/server/main-channel.c b/server/main-channel.c
index 201c573..e69e34e 100644
--- a/server/main-channel.c
+++ b/server/main-channel.c
@@ -22,9 +22,10 @@
 #include <common/ring.h>
 
 #include "red-common.h"
-#include "main-channel.h"
 #include "reds.h"
 #include "red-channel-client.h"
+#include "main-channel.h"
+#include "main-channel-client.h"
 
 int main_channel_is_connected(MainChannel *main_chan)
 {
diff --git a/server/red-qxl.c b/server/red-qxl.c
index e517b41..87d613b 100644
--- a/server/red-qxl.c
+++ b/server/red-qxl.c
@@ -36,6 +36,7 @@
 #include "reds.h"
 #include "dispatcher.h"
 #include "red-parse-qxl.h"
+#include "main-channel-client.h"
 
 #include "red-qxl.h"
 
diff --git a/server/reds.c b/server/reds.c
index a71029f..fc116e0 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -73,6 +73,7 @@
 #include "reds-private.h"
 #include "video-encoder.h"
 #include "red-channel-client.h"
+#include "main-channel-client.h"
 
 static void reds_client_monitors_config(RedsState *reds, VDAgentMonitorsConfig *monitors_config);
 static gboolean reds_use_client_monitors_config(RedsState *reds);
diff --git a/server/sound.c b/server/sound.c
index 4edf8ed..db23e95 100644
--- a/server/sound.c
+++ b/server/sound.c
@@ -41,6 +41,7 @@
 #include "sound.h"
 #include <common/snd_codec.h>
 #include "demarshallers.h"
+#include "main-channel-client.h"
 
 #ifndef IOV_MAX
 #define IOV_MAX 1024
diff --git a/server/stream.c b/server/stream.c
index b28c58b..6533111 100644
--- a/server/stream.c
+++ b/server/stream.c
@@ -20,6 +20,7 @@
 
 #include "stream.h"
 #include "display-channel.h"
+#include "main-channel-client.h"
 
 #define FPS_TEST_INTERVAL 1
 #define FOREACH_STREAMS(display, item)                  \
commit 74a834dacad24aa5fce9e7ff3b9e8a5cf7cfd8a1
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Mon Oct 17 14:13:58 2016 +0100

    Avoid to typedef twice RedChannel and RedClient
    
    These are already defined in red-channel.h which is included in
    red-channel-client.h header.
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Jonathon Jongsma <jjongsma at redhat.com>

diff --git a/server/red-channel-client.h b/server/red-channel-client.h
index 9cc5245..c2c6407 100644
--- a/server/red-channel-client.h
+++ b/server/red-channel-client.h
@@ -49,9 +49,6 @@ G_BEGIN_DECLS
 #define RED_CHANNEL_CLIENT_GET_CLASS(obj) \
     (G_TYPE_INSTANCE_GET_CLASS((obj), RED_TYPE_CHANNEL_CLIENT, RedChannelClientClass))
 
-typedef struct RedChannel RedChannel;
-typedef struct RedClient RedClient;
-
 typedef struct RedChannelClient RedChannelClient;
 typedef struct RedChannelClientClass RedChannelClientClass;
 typedef struct RedChannelClientPrivate RedChannelClientPrivate;