From patchwork Mon Jun 13 21:01:53 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 100180 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 9E9D8B6F7E for ; Tue, 14 Jun 2011 07:05:01 +1000 (EST) Received: from localhost ([::1]:50516 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QWEJe-0007iF-HM for incoming@patchwork.ozlabs.org; Mon, 13 Jun 2011 17:04:58 -0400 Received: from eggs.gnu.org ([140.186.70.92]:51593) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QWEGn-0007hh-MR for qemu-devel@nongnu.org; Mon, 13 Jun 2011 17:02:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QWEGl-00050P-Cr for qemu-devel@nongnu.org; Mon, 13 Jun 2011 17:02:01 -0400 Received: from v220110690675601.yourvserver.net ([78.47.199.172]:37930) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QWEGl-00050A-2Y for qemu-devel@nongnu.org; Mon, 13 Jun 2011 17:01:59 -0400 Received: from localhost (v220110690675601.yourvserver.net.local [127.0.0.1]) by v220110690675601.yourvserver.net (Postfix) with ESMTP id 190AF72818A6; Mon, 13 Jun 2011 23:01:56 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at weilnetz.de Received: from v220110690675601.yourvserver.net ([127.0.0.1]) by localhost (v220110690675601.yourvserver.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LzTgzMA1kSVz; Mon, 13 Jun 2011 23:01:55 +0200 (CEST) Received: from flocke.weilnetz.de (p54ADA74C.dip.t-dialin.net [84.173.167.76]) by v220110690675601.yourvserver.net (Postfix) with ESMTPSA id 564DE72818A5; Mon, 13 Jun 2011 23:01:55 +0200 (CEST) Received: from stefan by flocke.weilnetz.de with local (Exim 4.72) (envelope-from ) id 1QWEGg-0002LD-9m; Mon, 13 Jun 2011 23:01:54 +0200 From: Stefan Weil To: QEMU Developers Date: Mon, 13 Jun 2011 23:01:53 +0200 Message-Id: <1307998913-8970-1-git-send-email-weil@mail.berlios.de> X-Mailer: git-send-email 1.7.2.5 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 78.47.199.172 Cc: Anthony Liguori , Luiz Capitulino Subject: [Qemu-devel] [PATCH] 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 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 --- 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