[Spice-devel] [PATCH spice-server 5/6] Move RedUpgradeItem declaration in video-stream.h

Frediano Ziglio fziglio at redhat.com
Fri Dec 8 15:55:23 UTC 2017


This structure is used to send a message related to streams.
There are already other items defined in video-stream.h so
move the declaration.

Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
---
This is a long attempt to remove the need to include
display-channel-private.h inclusion in video-stream.c
---
 server/display-channel-private.h | 6 ------
 server/video-stream.h            | 6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/server/display-channel-private.h b/server/display-channel-private.h
index 24fa42b1..617ce30d 100644
--- a/server/display-channel-private.h
+++ b/server/display-channel-private.h
@@ -178,12 +178,6 @@ typedef struct RedSurfaceDestroyItem {
     SpiceMsgSurfaceDestroy surface_destroy;
 } RedSurfaceDestroyItem;
 
-typedef struct RedUpgradeItem {
-    RedPipeItem base;
-    Drawable *drawable;
-    SpiceClipRects *rects;
-} RedUpgradeItem;
-
 static inline int is_equal_path(SpicePath *path1, SpicePath *path2)
 {
     SpicePathSeg *seg1, *seg2;
diff --git a/server/video-stream.h b/server/video-stream.h
index 2dfcf7bf..cf912152 100644
--- a/server/video-stream.h
+++ b/server/video-stream.h
@@ -45,6 +45,12 @@
 
 typedef struct VideoStream VideoStream;
 
+typedef struct RedUpgradeItem {
+    RedPipeItem base;
+    Drawable *drawable;
+    SpiceClipRects *rects;
+} RedUpgradeItem;
+
 typedef struct RedStreamActivateReportItem {
     RedPipeItem pipe_item;
     uint32_t stream_id;
-- 
2.14.3



More information about the Spice-devel mailing list