[Spice-commits] server/Makefile.am server/red-stream-device.c server/red-stream-device.h server/reds.c server/stream-device.c server/stream-device.h

[Frediano Ziglio]

 server/Makefile.am         |    4 ++--
 server/red-stream-device.c |    4 +---
 server/reds.c              |    2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit a4d40532da4f499eb7d98b6be1e2265de563fc4e
Author: Eduardo Lima (Etrunko) <etrunko at redhat.com>
Date:   Mon Mar 12 16:14:30 2018 -0300

    Rename stream-device.[ch] to red-stream-device.[ch]
    
    In order to avoid confusion with file named stream-device.h, from
    spice-protocol.
    
    Signed-off-by: Eduardo Lima (Etrunko) <etrunko at redhat.com>
    Acked-by: Frediano Ziglio <fziglio at redhat.com>

diff --git a/server/Makefile.am b/server/Makefile.am
index 61725990..2fee378f 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -167,8 +167,8 @@ libserver_la_SOURCES =				\
 	stat.h					\
 	stream-channel.c			\
 	stream-channel.h			\
-	stream-device.c				\
-	stream-device.h				\
+	red-stream-device.c			\
+	red-stream-device.h			\
 	sw-canvas.c				\
 	tree.c					\
 	tree.h					\
diff --git a/server/stream-device.c b/server/red-stream-device.c
similarity index 99%
rename from server/stream-device.c
rename to server/red-stream-device.c
index 6cf29d37..c87c4899 100644
--- a/server/stream-device.c
+++ b/server/red-stream-device.c
@@ -19,9 +19,7 @@
 #include <config.h>
 #endif
 
-#include "stream-device.h"
-
-#include <spice/stream-device.h>
+#include "red-stream-device.h"
 
 #include "stream-channel.h"
 #include "cursor-channel.h"
diff --git a/server/stream-device.h b/server/red-stream-device.h
similarity index 100%
rename from server/stream-device.h
rename to server/red-stream-device.h
diff --git a/server/reds.c b/server/reds.c
index 415d570f..752bf7c2 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -74,7 +74,7 @@
 #include "red-client.h"
 #include "glib-compat.h"
 #include "net-utils.h"
-#include "stream-device.h"
+#include "red-stream-device.h"
 
 #define REDS_MAX_STAT_NODES 100