From patchwork Tue Jun 21 17:57:26 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 101348 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 405D8B6F83 for ; Wed, 22 Jun 2011 04:35:48 +1000 (EST) Received: from localhost ([::1]:59148 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QZ5nd-0006Ei-Fh for incoming@patchwork.ozlabs.org; Tue, 21 Jun 2011 14:35:45 -0400 Received: from eggs.gnu.org ([140.186.70.92]:41189) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QZ5Cl-0004Jd-7s for qemu-devel@nongnu.org; Tue, 21 Jun 2011 13:57:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QZ5Cj-0000rG-QT for qemu-devel@nongnu.org; Tue, 21 Jun 2011 13:57:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:19976) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QZ5Cj-0000r2-5F for qemu-devel@nongnu.org; Tue, 21 Jun 2011 13:57:37 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p5LHvZOn007050 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 21 Jun 2011 13:57:35 -0400 Received: from localhost (ovpn-113-137.phx2.redhat.com [10.3.113.137]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p5LHvYBt029154; Tue, 21 Jun 2011 13:57:34 -0400 From: Luiz Capitulino To: aliguori@us.ibm.com Date: Tue, 21 Jun 2011 14:57:26 -0300 Message-Id: <1308679048-4441-2-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1308679048-4441-1-git-send-email-lcapitulino@redhat.com> References: <1308679048-4441-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 1/3] error framework: Fix compilation for w32/w64 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 From: Stefan Weil The declaration of function error_set() should use macro GCC_FMT_ATTR instead of gcc's format printf attribute. For w32/w64, both declarations are different and GCC_FMT_ATTR is needed. Compilation for w64 even failed with the original code because mingw64 defines a macro for printf. GCC_FMT_ATTR requires qemu-common.h, so add it in error.c (it's also included by error_int.h but too late). Remove assert.h which is included by qemu-common.h. Cc: Luiz Capitulino Cc: Anthony Liguori Signed-off-by: Stefan Weil Signed-off-by: Luiz Capitulino --- error.c | 3 ++- error.h | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/error.c b/error.c index 867eec2..74d7398 100644 --- a/error.c +++ b/error.c @@ -9,11 +9,12 @@ * This work is licensed under the terms of the GNU LGPL, version 2. See * the COPYING.LIB file in the top-level directory. */ + +#include "qemu-common.h" #include "error.h" #include "error_int.h" #include "qemu-objects.h" #include "qerror.h" -#include struct Error { diff --git a/error.h b/error.h index 003c855..0f92a6f 100644 --- a/error.h +++ b/error.h @@ -25,8 +25,7 @@ typedef struct Error Error; * Currently, qerror.h defines these error formats. This function is not * meant to be used outside of QEMU. */ -void error_set(Error **err, const char *fmt, ...) - __attribute__((format(printf, 2, 3))); +void error_set(Error **err, const char *fmt, ...) GCC_FMT_ATTR(2, 3); /** * Returns true if an indirect pointer to an error is pointing to a valid