[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 16/18] qemu-pixman.h: Avoid mutual inclusion loop wi
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH 16/18] qemu-pixman.h: Avoid mutual inclusion loop with console.h |
Date: |
Wed, 30 Jan 2013 11:24:28 +0100 |
From: Peter Maydell <address@hidden>
Remove an unnecessary mutual inclusion loop between qemu-pixman.h and
console.h, since the former was only including the latter for
'PixelFormat*', which can be provided by typedefs.h. This requires a
minor adjustment to the files which included qemu-pixman.h, since
they were relying on it implicitly dragging in all of console.h.
Signed-off-by: Peter Maydell <address@hidden>
Acked-by: Gerd Hoffmann <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
include/ui/qemu-pixman.h | 2 +-
include/ui/spice-display.h | 1 +
ui/qemu-pixman.c | 3 ++-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/include/ui/qemu-pixman.h b/include/ui/qemu-pixman.h
index 016fd87..b032f52 100644
--- a/include/ui/qemu-pixman.h
+++ b/include/ui/qemu-pixman.h
@@ -15,7 +15,7 @@
#pragma GCC diagnostic error "-Wredundant-decls"
#endif
-#include "console.h"
+#include "qemu/typedefs.h"
/*
* pixman image formats are defined to be native endian,
diff --git a/include/ui/spice-display.h b/include/ui/spice-display.h
index 8b192e9..46f9530 100644
--- a/include/ui/spice-display.h
+++ b/include/ui/spice-display.h
@@ -21,6 +21,7 @@
#include "qemu/thread.h"
#include "ui/qemu-pixman.h"
+#include "ui/console.h"
#include "sysemu/sysemu.h"
#define NUM_MEMSLOTS 8
diff --git a/ui/qemu-pixman.c b/ui/qemu-pixman.c
index 609335a..6dcbe90 100644
--- a/ui/qemu-pixman.c
+++ b/ui/qemu-pixman.c
@@ -3,7 +3,8 @@
* See the COPYING file in the top-level directory.
*/
-#include "ui/qemu-pixman.h"
+#include "qemu-common.h"
+#include "ui/console.h"
int qemu_pixman_get_type(int rshift, int gshift, int bshift)
{
--
1.8.1
- [Qemu-devel] [PATCH 02/18] cadence_ttc: Debug mode compile fixes, (continued)
- [Qemu-devel] [PATCH 02/18] cadence_ttc: Debug mode compile fixes, Stefan Hajnoczi, 2013/01/30
- [Qemu-devel] [PATCH 4/4] hw/tpci200: Fix compiler warning (redefined symbol with MinGW), Stefan Hajnoczi, 2013/01/30
- [Qemu-devel] [PATCH 3/4] configure: silence pkg-config's check for curses, Stefan Hajnoczi, 2013/01/30
- [Qemu-devel] [PATCH 04/18] xilinx_axidma: Fix debug mode compile messages, Stefan Hajnoczi, 2013/01/30
- [Qemu-devel] [PATCH 05/18] g_malloc(0) and g_malloc0(0) return NULL; simplify, Stefan Hajnoczi, 2013/01/30
- [Qemu-devel] [PATCH 10/18] virtfs-proxy-helper: Fix unchecked strdup() by conv. to g_strdup(), Stefan Hajnoczi, 2013/01/30
- [Qemu-devel] [PATCH 09/18] spice: Fix unchecked strdup() by converting to g_strdup(), Stefan Hajnoczi, 2013/01/30
- [Qemu-devel] [PATCH 15/18] qemu-ga: Fix unchecked strdup() by converting to g_strdup(), Stefan Hajnoczi, 2013/01/30
- [Qemu-devel] [PATCH 13/18] libcacard: Fix unchecked strdup() by converting to g_strdup(), Stefan Hajnoczi, 2013/01/30
- [Qemu-devel] [PATCH 14/18] qapi: Fix unchecked strdup() by converting to g_strdup(), Stefan Hajnoczi, 2013/01/30
- [Qemu-devel] [PATCH 16/18] qemu-pixman.h: Avoid mutual inclusion loop with console.h,
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH 18/18] qmp-commands.hx: s/tray-open/tray_open/ to match qapi schema, Stefan Hajnoczi, 2013/01/30
- [Qemu-devel] [PATCH 06/18] g_strdup(NULL) returns NULL; simplify, Stefan Hajnoczi, 2013/01/30
- [Qemu-devel] [PATCH 08/18] readline: Fix unchecked strdup() by converting to g_strdup(), Stefan Hajnoczi, 2013/01/30
- [Qemu-devel] [PATCH 17/18] tests: Fix {rtc, m48t59}-test build on illumos, Stefan Hajnoczi, 2013/01/30
- [Qemu-devel] [PATCH 07/18] hw/9pfs: Fix unchecked strdup() by converting to g_strdup(), Stefan Hajnoczi, 2013/01/30
- [Qemu-devel] [PATCH 11/18] qemu-log: Fix unchecked strdup() by converting to g_strdup(), Stefan Hajnoczi, 2013/01/30
- [Qemu-devel] [PATCH 12/18] qemu-log: Plug trivial memory leak in cpu_set_log_filename(), Stefan Hajnoczi, 2013/01/30