From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:47024) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RK7Yb-00068P-6J for qemu-devel@nongnu.org; Sat, 29 Oct 2011 07:58:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RK7YZ-000316-Pm for qemu-devel@nongnu.org; Sat, 29 Oct 2011 07:58:37 -0400 Received: from mnementh.archaic.org.uk ([81.2.115.146]:57848) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RK7YZ-0002qu-JF for qemu-devel@nongnu.org; Sat, 29 Oct 2011 07:58:35 -0400 From: Peter Maydell Date: Sat, 29 Oct 2011 12:58:26 +0100 Message-Id: <1319889506-20487-1-git-send-email-peter.maydell@linaro.org> Subject: [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: qemu-devel@nongnu.org Cc: Aurelien Jarno , patches@linaro.org 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 --- 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 -- 1.7.4.1