From 405a1f71ca138b281a8fe4e08356f1baf9e9b296 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Thu, 8 Jul 2010 15:44:15 +0200
Subject: [PATCH] Fix inclusion of common files, no need for common/ part

---
 canvas_base.h  | 2 +-
 draw.h         | 2 +-
 lines.h        | 2 +-
 lz.h           | 2 +-
 marshaller.h   | 2 +-
 messages.h     | 2 +-
 pixman_utils.h | 2 +-
 rect.h         | 2 +-
 region.h       | 2 +-
 rop3.h         | 2 +-
 sw_canvas.h    | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/canvas_base.h b/canvas_base.h
index 55e1b33..0d25a3f 100644
--- a/canvas_base.h
+++ b/canvas_base.h
@@ -23,7 +23,7 @@
 #include "pixman_utils.h"
 #include "lz.h"
 #include "region.h"
-#include <common/draw.h>
+#include "draw.h"
 
 typedef void (*spice_destroy_fn_t)(void *data);
 
diff --git a/draw.h b/draw.h
index 5741eff..ab9da69 100644
--- a/draw.h
+++ b/draw.h
@@ -33,7 +33,7 @@
 
 #include <spice/types.h>
 #include <spice/enums.h>
-#include <common/mem.h>
+#include "mem.h"
 
 #define SPICE_GET_ADDRESS(addr) ((void *)(unsigned long)(addr))
 #define SPICE_SET_ADDRESS(addr, val) ((addr) = (unsigned long)(val))
diff --git a/lines.h b/lines.h
index 8a60c03..1d092f0 100644
--- a/lines.h
+++ b/lines.h
@@ -52,7 +52,7 @@ SOFTWARE.
 #include <pixman_utils.h>
 #include <stdlib.h>
 #include <string.h>
-#include <common/draw.h>
+#include "draw.h"
 
 typedef struct lineGC lineGC;
 
diff --git a/lz.h b/lz.h
index fb61e10..993609f 100644
--- a/lz.h
+++ b/lz.h
@@ -8,7 +8,7 @@
 
 #include "lz_common.h"
 #include "lz_config.h"
-#include <common/draw.h>
+#include "draw.h"
 
 typedef void *LzContext;
 
diff --git a/marshaller.h b/marshaller.h
index e7e6637..4d77140 100644
--- a/marshaller.h
+++ b/marshaller.h
@@ -20,7 +20,7 @@
 #define _H_MARSHALLER
 
 #include <spice/types.h>
-#include <common/mem.h>
+#include "mem.h"
 #ifndef WIN32
 #include <sys/uio.h>
 #endif
diff --git a/messages.h b/messages.h
index 4cbd80e..a6433b0 100644
--- a/messages.h
+++ b/messages.h
@@ -32,7 +32,7 @@
 #define _H_MESSAGES
 
 #include <spice/protocol.h>
-#include <common/draw.h>
+#include "draw.h"
 
 typedef struct SpiceMsgData {
     uint32_t data_size;
diff --git a/pixman_utils.h b/pixman_utils.h
index 45a58ca..e15b682 100644
--- a/pixman_utils.h
+++ b/pixman_utils.h
@@ -24,7 +24,7 @@
 #define PIXMAN_DONT_DEFINE_STDINT
 #include <pixman.h>
 
-#include <common/draw.h>
+#include "draw.h"
 
 /* This lists all possible 2 argument binary raster ops.
  * This enum has the same values as the X11 GXcopy type
diff --git a/rect.h b/rect.h
index 7d8e752..cdd4335 100644
--- a/rect.h
+++ b/rect.h
@@ -19,7 +19,7 @@
 #ifndef _H_RECT
 #define _H_RECT
 
-#include <common/draw.h>
+#include "draw.h"
 #include <spice/macros.h>
 
 static inline void rect_sect(SpiceRect* r, const SpiceRect* bounds)
diff --git a/region.h b/region.h
index c90e06f..bad7494 100644
--- a/region.h
+++ b/region.h
@@ -20,7 +20,7 @@
 #define _H_REGION
 
 #include <stdint.h>
-#include <common/draw.h>
+#include "draw.h"
 #include <pixman_utils.h>
 
 typedef pixman_region32_t QRegion;
diff --git a/rop3.h b/rop3.h
index 15f31d4..0211130 100644
--- a/rop3.h
+++ b/rop3.h
@@ -21,7 +21,7 @@
 
 #include <stdint.h>
 
-#include <common/draw.h>
+#include "draw.h"
 #include "pixman_utils.h"
 
 void do_rop3_with_pattern(uint8_t rop3, pixman_image_t *d, pixman_image_t *s, SpicePoint *src_pos,
diff --git a/sw_canvas.h b/sw_canvas.h
index 2d55118..473bbc1 100644
--- a/sw_canvas.h
+++ b/sw_canvas.h
@@ -21,7 +21,7 @@
 
 #include <stdint.h>
 
-#include <common/draw.h>
+#include "draw.h"
 #include "pixman_utils.h"
 #include "canvas_base.h"
 #include "region.h"