Mon May 9 11:46:42 UTC 2016

server/Makefile.am              |    1 -
 server/cache-item.h             |    2 +-
 server/cursor-channel.c         |    2 +-
 server/dcc-encoders.h           |    4 ++--
 server/dcc-send.c               |    4 ++--
 server/dispatcher.c             |    4 ++--
 server/display-channel.h        |    5 +++--
 server/glz-encoder.h            |    2 +-
 server/image-cache.h            |    6 +++---
 server/inputs-channel.c         |    6 +++---
 server/main-channel.c           |    6 +++---
 server/main-channel.h           |    2 +-
 server/red-channel.c            |    4 ++--
 server/red-channel.h            |    4 ++--
 server/red-common.h             |   16 ++++++++--------
 server/red-parse-qxl.c          |    2 +-
 server/red-qxl.c                |    4 ++--
 server/red-worker.c             |    8 ++++----
 server/reds-stream.c            |    2 +-
 server/reds-stream.h            |    2 +-
 server/reds.c                   |    4 ++--
 server/reds.h                   |    4 ++--
 server/sound.c                  |    6 +++---
 server/spicevmc.c               |    2 +-
 server/stream.h                 |    2 +-
 server/sw-canvas.c              |    4 ++--
 server/sw-canvas.h              |   22 ----------------------
 server/tests/basic_event_loop.c |    4 ++--
 server/tests/replay.c           |    2 +-
 server/tests/stream-test.c      |    2 +-
 server/tree.h                   |    4 ++--
 31 files changed, 60 insertions(+), 82 deletions(-)

New commits:
commit 76f643030f7e1be34f212f9cb3dc3e8f3de63114
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Mon May 9 11:33:51 2016 +0100

    remove sw-canvas.h
    
    This include was just including another file
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Pavel Grunt <pgrunt at redhat.com>

diff --git a/server/Makefile.am b/server/Makefile.am
index b548205..fbf4638 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 0f4d994..1d20be0 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 846d42d..47fafab 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 027b866..c237370 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 c5ededd..0000000
--- 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_ */
commit 1e4800507b4879233ab9895c022e4a90cbb2ecd3
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Mon May 9 11:21:17 2016 +0100

    use #include<> style for spice-common header inclusions.
    
    The include directory is specified with the -I which is the directory
    used directly by #include<>.
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Pavel Grunt <pgrunt at redhat.com>

diff --git a/server/cache-item.h b/server/cache-item.h
index 7dde902..f72c0ff 100644
--- a/server/cache-item.h
+++ b/server/cache-item.h
@@ -19,7 +19,7 @@
 # define CACHE_ITEM_H_
 
 #include "red-channel.h"
-#include "common/ring.h"
+#include <common/ring.h>
 
 typedef struct RedCacheItem RedCacheItem;
 
diff --git a/server/cursor-channel.c b/server/cursor-channel.c
index 697d61d..444d89b 100644
--- a/server/cursor-channel.c
+++ b/server/cursor-channel.c
@@ -20,7 +20,7 @@
 #endif
 
 #include <glib.h>
-#include "common/generated_server_marshallers.h"
+#include <common/generated_server_marshallers.h>
 #include "cursor-channel.h"
 #include "cache-item.h"
 
diff --git a/server/dcc-encoders.h b/server/dcc-encoders.h
index 1cfc4f7..14759c5 100644
--- a/server/dcc-encoders.h
+++ b/server/dcc-encoders.h
@@ -19,8 +19,8 @@
 #define DCC_ENCODERS_H_
 
 #include <setjmp.h>
-#include "common/marshaller.h"
-#include "common/quic.h"
+#include <common/marshaller.h>
+#include <common/quic.h>
 #include "red-channel.h"
 #include "red-parse-qxl.h"
 #include "image-cache.h"
diff --git a/server/dcc-send.c b/server/dcc-send.c
index fcec8d3..5f967cc 100644
--- a/server/dcc-send.c
+++ b/server/dcc-send.c
@@ -22,8 +22,8 @@
 #include "dcc.h"
 #include "display-channel.h"
 
-#include "common/marshaller.h"
-#include "common/generated_server_marshallers.h"
+#include <common/marshaller.h>
+#include <common/generated_server_marshallers.h>
 
 typedef enum {
     FILL_BITS_TYPE_INVALID,
diff --git a/server/dispatcher.c b/server/dispatcher.c
index 7e71ea2..b9e23f6 100644
--- a/server/dispatcher.c
+++ b/server/dispatcher.c
@@ -28,8 +28,8 @@
 
 #define SPICE_LOG_DOMAIN "SpiceDispatcher"
 
-#include "common/mem.h"
-#include "common/spice_common.h"
+#include <common/mem.h>
+#include <common/spice_common.h>
 #include "dispatcher.h"
 
 //#define DEBUG_DISPATCHER
diff --git a/server/display-channel.h b/server/display-channel.h
index 84ec8ab..0f4d994 100644
--- a/server/display-channel.h
+++ b/server/display-channel.h
@@ -20,7 +20,7 @@
 
 #include <setjmp.h>
 
-#include "common/rect.h"
+#include <common/rect.h>
 #include "red-worker.h"
 #include "reds-stream.h"
 #include "cache-item.h"
diff --git a/server/glz-encoder.h b/server/glz-encoder.h
index 0493b83..6f4f44d 100644
--- a/server/glz-encoder.h
+++ b/server/glz-encoder.h
@@ -21,7 +21,7 @@
 /* Manging the lz encoding using a dictionary that is shared among encoders */
 
 #include "red-common.h"
-#include "common/lz_common.h"
+#include <common/lz_common.h>
 #include "glz-encoder-dict.h"
 
 struct GlzEncoderUsrContext {
diff --git a/server/image-cache.h b/server/image-cache.h
index 014a45e..f61aeb4 100644
--- a/server/image-cache.h
+++ b/server/image-cache.h
@@ -20,9 +20,9 @@
 
 #include <inttypes.h>
 
-#include "common/pixman_utils.h"
-#include "common/canvas_base.h"
-#include "common/ring.h"
+#include <common/pixman_utils.h>
+#include <common/canvas_base.h>
+#include <common/ring.h>
 
 /* FIXME: move back to display-channel.h (once structs are private) */
 typedef struct Drawable Drawable;
diff --git a/server/inputs-channel.c b/server/inputs-channel.c
index da26cf6..0ce12de 100644
--- a/server/inputs-channel.c
+++ b/server/inputs-channel.c
@@ -29,9 +29,9 @@
 #include <spice/protocol.h>
 #include <stdbool.h>
 
-#include "common/marshaller.h"
-#include "common/messages.h"
-#include "common/generated_server_marshallers.h"
+#include <common/marshaller.h>
+#include <common/messages.h>
+#include <common/generated_server_marshallers.h>
 
 #include "demarshallers.h"
 #include "spice.h"
diff --git a/server/main-channel.c b/server/main-channel.c
index 6fc21b7..98ce660 100644
--- a/server/main-channel.c
+++ b/server/main-channel.c
@@ -35,9 +35,9 @@
 #include <errno.h>
 #include <ctype.h>
 
-#include "common/generated_server_marshallers.h"
-#include "common/messages.h"
-#include "common/ring.h"
+#include <common/generated_server_marshallers.h>
+#include <common/messages.h>
+#include <common/ring.h>
 
 #include "demarshallers.h"
 #include "main-channel.h"
diff --git a/server/main-channel.h b/server/main-channel.h
index 34e91b0..473ed6f 100644
--- a/server/main-channel.h
+++ b/server/main-channel.h
@@ -20,7 +20,7 @@
 
 #include <stdint.h>
 #include <spice/vd_agent.h>
-#include "common/marshaller.h"
+#include <common/marshaller.h>
 #include "red-channel.h"
 
 // TODO: Defines used to calculate receive buffer size, and also by reds.c
diff --git a/server/red-channel.c b/server/red-channel.c
index cdd1cf0..a99c6c6 100644
--- a/server/red-channel.c
+++ b/server/red-channel.c
@@ -35,8 +35,8 @@
 #include <linux/sockios.h> /* SIOCOUTQ */
 #endif
 
-#include "common/generated_server_marshallers.h"
-#include "common/ring.h"
+#include <common/generated_server_marshallers.h>
+#include <common/ring.h>
 
 #include "red-channel.h"
 #include "reds.h"
diff --git a/server/red-channel.h b/server/red-channel.h
index d169a9a..bc225c6 100644
--- a/server/red-channel.h
+++ b/server/red-channel.h
@@ -25,8 +25,8 @@
 #include <pthread.h>
 #include <limits.h>
 
-#include "common/ring.h"
-#include "common/marshaller.h"
+#include <common/ring.h>
+#include <common/marshaller.h>
 
 #include "spice.h"
 #include "red-common.h"
diff --git a/server/red-common.h b/server/red-common.h
index a9339fb..3a63f04 100644
--- a/server/red-common.h
+++ b/server/red-common.h
@@ -27,14 +27,14 @@
 #include <unistd.h>
 
 #include <spice/macros.h>
-#include "common/log.h"
-#include "common/lz_common.h"
-#include "common/marshaller.h"
-#include "common/mem.h"
-#include "common/messages.h"
-#include "common/ring.h"
-#include "common/spice_common.h"
-#include "common/draw.h"
+#include <common/log.h>
+#include <common/lz_common.h>
+#include <common/marshaller.h>
+#include <common/mem.h>
+#include <common/messages.h>
+#include <common/ring.h>
+#include <common/spice_common.h>
+#include <common/draw.h>
 
 #include "spice.h"
 #include "utils.h"
diff --git a/server/red-parse-qxl.c b/server/red-parse-qxl.c
index 18b7ea6..d5358d3 100644
--- a/server/red-parse-qxl.c
+++ b/server/red-parse-qxl.c
@@ -22,7 +22,7 @@
 #include <stdbool.h>
 #include <inttypes.h>
 #include <glib.h>
-#include "common/lz_common.h"
+#include <common/lz_common.h>
 #include "spice-bitmap-utils.h"
 #include "red-common.h"
 #include "memslot.h"
diff --git a/server/red-qxl.c b/server/red-qxl.c
index abde0ba..846d42d 100644
--- a/server/red-qxl.c
+++ b/server/red-qxl.c
@@ -28,7 +28,7 @@
 #include <inttypes.h>
 
 #include <spice/qxl_dev.h>
-#include "common/quic.h"
+#include <common/quic.h>
 
 #include "spice.h"
 #include "red-worker.h"
diff --git a/server/red-worker.c b/server/red-worker.c
index aa04988..8d8073e 100644
--- a/server/red-worker.c
+++ b/server/red-worker.c
@@ -39,10 +39,10 @@
 
 #include <spice/protocol.h>
 #include <spice/qxl_dev.h>
-#include "common/lz.h"
-#include "common/rect.h"
-#include "common/region.h"
-#include "common/ring.h"
+#include <common/lz.h>
+#include <common/rect.h>
+#include <common/region.h>
+#include <common/ring.h>
 
 #include "display-channel.h"
 #include "stream.h"
diff --git a/server/reds-stream.c b/server/reds-stream.c
index 294223a..9896eab 100644
--- a/server/reds-stream.c
+++ b/server/reds-stream.c
@@ -21,7 +21,7 @@
 
 #include "main-dispatcher.h"
 #include "red-common.h"
-#include "common/log.h"
+#include <common/log.h>
 #include "reds-stream.h"
 #include "reds.h"
 
diff --git a/server/reds-stream.h b/server/reds-stream.h
index 705d7fd..7392f56 100644
--- a/server/reds-stream.h
+++ b/server/reds-stream.h
@@ -19,7 +19,7 @@
 #define _H_REDS_STREAM
 
 #include "spice.h"
-#include "common/mem.h"
+#include <common/mem.h>
 #include "red-common.h"
 
 #include <stdbool.h>
diff --git a/server/reds.c b/server/reds.c
index 67c262a..f54534a 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -49,8 +49,8 @@
 #include <spice/vd_agent.h>
 #include <spice/stats.h>
 
-#include "common/generated_server_marshallers.h"
-#include "common/ring.h"
+#include <common/generated_server_marshallers.h>
+#include <common/ring.h>
 
 #include "spice.h"
 #include "reds.h"
diff --git a/server/reds.h b/server/reds.h
index fbf7372..f0f28da 100644
--- a/server/reds.h
+++ b/server/reds.h
@@ -24,8 +24,8 @@
 #include <config.h>
 
 
-#include "common/marshaller.h"
-#include "common/messages.h"
+#include <common/marshaller.h>
+#include <common/messages.h>
 #include "char-device.h"
 #include "spice.h"
 #include "red-channel.h"
diff --git a/server/sound.c b/server/sound.c
index aae841c..8335101 100644
--- a/server/sound.c
+++ b/server/sound.c
@@ -26,8 +26,8 @@
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
 
-#include "common/marshaller.h"
-#include "common/generated_server_marshallers.h"
+#include <common/marshaller.h>
+#include <common/generated_server_marshallers.h>
 
 #include "spice.h"
 #include "red-common.h"
@@ -35,7 +35,7 @@
 #include "reds.h"
 #include "red-qxl.h"
 #include "sound.h"
-#include "common/snd_codec.h"
+#include <common/snd_codec.h>
 #include "demarshallers.h"
 
 #ifndef IOV_MAX
diff --git a/server/spicevmc.c b/server/spicevmc.c
index 54dfe4a..283a8f0 100644
--- a/server/spicevmc.c
+++ b/server/spicevmc.c
@@ -28,7 +28,7 @@
 #include <netinet/in.h> // IPPROTO_TCP
 #include <netinet/tcp.h> // TCP_NODELAY
 
-#include "common/generated_server_marshallers.h"
+#include <common/generated_server_marshallers.h>
 
 #include "char-device.h"
 #include "red-channel.h"
diff --git a/server/stream.h b/server/stream.h
index de6a132..011467b 100644
--- a/server/stream.h
+++ b/server/stream.h
@@ -21,7 +21,7 @@
 #include <glib.h>
 #include "utils.h"
 #include "video-encoder.h"
-#include "common/region.h"
+#include <common/region.h>
 #include "red-channel.h"
 #include "image-cache.h"
 
diff --git a/server/sw-canvas.c b/server/sw-canvas.c
index a1bd791..027b866 100644
--- a/server/sw-canvas.c
+++ b/server/sw-canvas.c
@@ -18,4 +18,4 @@
 #include <config.h>
 #endif
 #include "sw-canvas.h"
-#include "common/sw_canvas.c"
+#include <common/sw_canvas.c>
diff --git a/server/sw-canvas.h b/server/sw-canvas.h
index 0500ad2..c5ededd 100644
--- a/server/sw-canvas.h
+++ b/server/sw-canvas.h
@@ -17,6 +17,6 @@
 #ifndef SW_CANVAS_H_
 #define SW_CANVAS_H_
 
-#include "common/sw_canvas.h"
+#include <common/sw_canvas.h>
 
 #endif /* SW_CANVAS_H_ */
diff --git a/server/tests/basic_event_loop.c b/server/tests/basic_event_loop.c
index 3f1bc71..b9e1b9c 100644
--- a/server/tests/basic_event_loop.c
+++ b/server/tests/basic_event_loop.c
@@ -24,8 +24,8 @@
 
 #include "red-common.h"
 #include "spice/macros.h"
-#include "common/ring.h"
-#include "common/mem.h"
+#include <common/ring.h>
+#include <common/mem.h>
 #include "basic_event_loop.h"
 
 int debug = 0;
diff --git a/server/tests/replay.c b/server/tests/replay.c
index 7e4659b..d552327 100644
--- a/server/tests/replay.c
+++ b/server/tests/replay.c
@@ -38,7 +38,7 @@
 #include <spice/macros.h>
 #include "red-replay-qxl.h"
 #include "test_display_base.h"
-#include "common/log.h"
+#include <common/log.h>
 
 static SpiceCoreInterface *core;
 static SpiceServer *server;
diff --git a/server/tests/stream-test.c b/server/tests/stream-test.c
index 3aa059c..6317796 100644
--- a/server/tests/stream-test.c
+++ b/server/tests/stream-test.c
@@ -3,7 +3,7 @@
 #include <errno.h>
 #include <unistd.h>
 
-#include "common/log.h"
+#include <common/log.h>
 #include "reds-stream.h"
 #include "basic_event_loop.h"
 
diff --git a/server/tree.h b/server/tree.h
index 8b9c6ba..6476082 100644
--- a/server/tree.h
+++ b/server/tree.h
@@ -19,8 +19,8 @@
 # define TREE_H_
 
 #include <stdint.h>
-#include "common/region.h"
-#include "common/ring.h"
+#include <common/region.h>
+#include <common/ring.h>
 #include "spice-bitmap-utils.h"
 
 enum {
