> 
> In order to avoid confusion with file named stream-device.h, from
> spice-protocol.
> 
> Signed-off-by: Eduardo Lima (Etrunko) <etru...@redhat.com>
> ---
>  server/Makefile.am                              | 4 ++--
>  server/{stream-device.c => red-stream-device.c} | 4 +---
>  server/{stream-device.h => red-stream-device.h} | 0
>  server/reds.c                                   | 2 +-
>  4 files changed, 4 insertions(+), 6 deletions(-)
>  rename server/{stream-device.c => red-stream-device.c} (99%)
>  rename server/{stream-device.h => red-stream-device.h} (100%)
> 
> 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 15048b82..6ce4a4c1 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 ca6fd44a..9fd50a55 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
>  

Acked-by: Frediano Ziglio <fzig...@redhat.com>

Frediano
_______________________________________________
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel

Reply via email to