From 76f643030f7e1be34f212f9cb3dc3e8f3de63114 Mon Sep 17 00:00:00 2001
From: Frediano Ziglio <fziglio@redhat.com>
Date: Mon, 9 May 2016 11:33:51 +0100
Subject: [PATCH] remove sw-canvas.h

This include was just including another file

Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Acked-by: Pavel Grunt <pgrunt@redhat.com>
---
 server/Makefile.am       |  1 -
 server/display-channel.h |  3 ++-
 server/red-qxl.c         |  2 +-
 server/sw-canvas.c       |  2 +-
 server/sw-canvas.h       | 22 ----------------------
 5 files changed, 4 insertions(+), 26 deletions(-)
 delete mode 100644 server/sw-canvas.h

diff --git a/server/Makefile.am b/server/Makefile.am
index b548205f..fbf4638c 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -119,7 +119,6 @@ libserver_la_SOURCES =				\
 	reds-stream.c				\
 	reds-stream.h				\
 	sw-canvas.c			\
-	sw-canvas.h			\
 	sound.c				\
 	sound.h				\
 	stat.h					\
diff --git a/server/display-channel.h b/server/display-channel.h
index 0f4d9945..1d20be06 100644
--- a/server/display-channel.h
+++ b/server/display-channel.h
@@ -21,11 +21,12 @@
 #include <setjmp.h>
 
 #include <common/rect.h>
+#include <common/sw_canvas.h>
+
 #include "red-worker.h"
 #include "reds-stream.h"
 #include "cache-item.h"
 #include "pixmap-cache.h"
-#include "sw-canvas.h"
 #include "stat.h"
 #include "reds.h"
 #include "memslot.h"
diff --git a/server/red-qxl.c b/server/red-qxl.c
index 846d42d4..47fafab5 100644
--- a/server/red-qxl.c
+++ b/server/red-qxl.c
@@ -29,10 +29,10 @@
 
 #include <spice/qxl_dev.h>
 #include <common/quic.h>
+#include <common/sw_canvas.h>
 
 #include "spice.h"
 #include "red-worker.h"
-#include "sw-canvas.h"
 #include "reds.h"
 #include "dispatcher.h"
 #include "red-parse-qxl.h"
diff --git a/server/sw-canvas.c b/server/sw-canvas.c
index 027b866f..c2373707 100644
--- a/server/sw-canvas.c
+++ b/server/sw-canvas.c
@@ -17,5 +17,5 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include "sw-canvas.h"
+#include <common/sw_canvas.h>
 #include <common/sw_canvas.c>
diff --git a/server/sw-canvas.h b/server/sw-canvas.h
deleted file mode 100644
index c5ededde..00000000
--- a/server/sw-canvas.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-   Copyright (C) 2011 Red Hat, Inc.
-
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef SW_CANVAS_H_
-#define SW_CANVAS_H_
-
-#include <common/sw_canvas.h>
-
-#endif /* SW_CANVAS_H_ */