From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:41822) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QWqGM-0006Im-Dh for qemu-devel@nongnu.org; Wed, 15 Jun 2011 09:36:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QWqGH-0008T7-HP for qemu-devel@nongnu.org; Wed, 15 Jun 2011 09:36:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:61630) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QWqGF-0008SV-TO for qemu-devel@nongnu.org; Wed, 15 Jun 2011 09:36:00 -0400 Date: Wed, 15 Jun 2011 10:35:53 -0300 From: Luiz Capitulino Message-ID: <20110615103553.40c1d9c2@doriath> In-Reply-To: <1307998913-8970-1-git-send-email-weil@mail.berlios.de> References: <1307998913-8970-1-git-send-email-weil@mail.berlios.de> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] error framework: Fix compilation for w32/w64 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Weil Cc: Anthony Liguori , QEMU Developers On Mon, 13 Jun 2011 23:01:53 +0200 Stefan Weil wrote: > 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 Applied to the monitor queue, thanks. > --- > 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