diff options
| author | Eduardo Lima (Etrunko) <etrunko@redhat.com> | 2018-03-12 16:14:30 -0300 |
|---|---|---|
| committer | Frediano Ziglio <fziglio@redhat.com> | 2018-03-13 10:53:05 +0000 |
| commit | a4d40532da4f499eb7d98b6be1e2265de563fc4e (patch) | |
| tree | fa34a3dc8e28de464d31ecfe93b6561c7b5bc32c | |
| parent | f4dd0f1aa75597dc1442e05d98b1bc2a532671eb (diff) | |
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@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
| -rw-r--r-- | server/Makefile.am | 4 | ||||
| -rw-r--r-- | server/red-stream-device.c (renamed from server/stream-device.c) | 4 | ||||
| -rw-r--r-- | server/red-stream-device.h (renamed from server/stream-device.h) | 0 | ||||
| -rw-r--r-- | server/reds.c | 2 |
4 files changed, 4 insertions, 6 deletions
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 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 index f0a5b5c1..f0a5b5c1 100644 --- a/server/stream-device.h +++ b/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 |