From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:49253) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RLIgz-0003Er-QO for qemu-devel@nongnu.org; Tue, 01 Nov 2011 14:04:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RLIgy-0002Tr-Lj for qemu-devel@nongnu.org; Tue, 01 Nov 2011 14:04:09 -0400 Received: from mail-qw0-f45.google.com ([209.85.216.45]:35357) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RLIgy-0002Iv-FK for qemu-devel@nongnu.org; Tue, 01 Nov 2011 14:04:08 -0400 Received: by mail-qw0-f45.google.com with SMTP id c12so7581813qad.4 for ; Tue, 01 Nov 2011 11:04:08 -0700 (PDT) Message-ID: <4EB03495.1070504@codemonkey.ws> Date: Tue, 01 Nov 2011 13:04:05 -0500 From: Anthony Liguori MIME-Version: 1.0 References: <1319889506-20487-1-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1319889506-20487-1-git-send-email-peter.maydell@linaro.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] ia64-dis.c: Undefine ABS to avoid clash with glib List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: qemu-devel@nongnu.org, Aurelien Jarno , patches@linaro.org On 10/29/2011 06:58 AM, Peter Maydell wrote: > Undefine ABS to avoid a clash with the macro that glib.h > helpfully defines for us (and a resulting build failure > on ia64 hosts). > > Signed-off-by: Peter Maydell Applied. Thanks. Regards, Anthony Liguori > --- > Bit of a namespace grab by glib.h if you ask me. Undefining > ABS seems the most straightforward fix. > > ia64-dis.c | 3 +++ > 1 files changed, 3 insertions(+), 0 deletions(-) > > diff --git a/ia64-dis.c b/ia64-dis.c > index 2886df3..2a103e6 100644 > --- a/ia64-dis.c > +++ b/ia64-dis.c > @@ -781,6 +781,9 @@ ext_inc3 (const struct ia64_operand *self, ia64_insn code, ia64_insn *valuep) > return 0; > } > > +/* glib.h defines ABS so we must undefine it to avoid a clash */ > +#undef ABS > + > #define CST IA64_OPND_CLASS_CST > #define REG IA64_OPND_CLASS_REG > #define IND IA64_OPND_CLASS_IND