From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:37683) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TxG6c-0003Ck-Ak for qemu-devel@nongnu.org; Mon, 21 Jan 2013 07:04:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TxG6Z-0007HK-9s for qemu-devel@nongnu.org; Mon, 21 Jan 2013 07:04:02 -0500 From: Peter Maydell Date: Mon, 21 Jan 2013 12:03:47 +0000 Message-Id: <1358769827-7317-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH v2] qemu-pixman.h: Avoid mutual inclusion loop with console.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Paolo Bonzini , Stefan Hajnoczi , patches@linaro.org 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 --- Stefan: I've made the obvious change to fix the spice compile issue, but none of my systems have a new enough spice-protocol/spice-server to allow me to configure with spice enabled. I'd appreciate it if you could check it does indeed compile OK now... 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.7.9.5