From patchwork Mon Jan 21 12:03:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 214114 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 943912C0084 for ; Mon, 21 Jan 2013 23:04:17 +1100 (EST) Received: from localhost ([::1]:55614 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TxG6p-0003E9-LK for incoming@patchwork.ozlabs.org; Mon, 21 Jan 2013 07:04:15 -0500 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 Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa ([2001:8b0:1d0::1]:60042 helo=mnementh.archaic.org.uk) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TxG6Z-0007EI-3I; Mon, 21 Jan 2013 07:03:59 -0500 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1TxG6N-0001uS-Du; Mon, 21 Jan 2013 12:03:47 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 21 Jan 2013 12:03:47 +0000 Message-Id: <1358769827-7317-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Cc: qemu-trivial@nongnu.org, Paolo Bonzini , Stefan Hajnoczi , patches@linaro.org Subject: [Qemu-devel] [PATCH v2] qemu-pixman.h: Avoid mutual inclusion loop with console.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.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 Acked-by: Gerd Hoffmann --- 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) {