From 0b0878611c64f027ca5d15ba641f423cc04ead3f Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Mon, 21 Jan 2013 12:03:47 +0000 Subject: qemu-pixman.h: Avoid mutual inclusion loop with console.h 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 Acked-by: Gerd Hoffmann Signed-off-by: Stefan Hajnoczi --- include/ui/qemu-pixman.h | 2 +- include/ui/spice-display.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/ui/qemu-pixman.h b/include/ui/qemu-pixman.h index 016fd87726..b032f529aa 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 8b192e9613..46f9530fe3 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 -- cgit v1.2.3-55-g7522