From patchwork Sat Oct 29 11:58:26 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 4878 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 403DE23E0C for ; Sat, 29 Oct 2011 11:58:34 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id 19F40A1876F for ; Sat, 29 Oct 2011 11:58:34 +0000 (UTC) Received: by faan26 with SMTP id n26so6581228faa.11 for ; Sat, 29 Oct 2011 04:58:34 -0700 (PDT) Received: by 10.223.64.207 with SMTP id f15mr13450500fai.7.1319889513881; Sat, 29 Oct 2011 04:58:33 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.1.71 with SMTP id 7cs35673lak; Sat, 29 Oct 2011 04:58:32 -0700 (PDT) Received: by 10.227.59.207 with SMTP id m15mr8766864wbh.12.1319889510459; Sat, 29 Oct 2011 04:58:30 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [81.2.115.146]) by mx.google.com with ESMTPS id gb4si9179708wbb.59.2011.10.29.04.58.29 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 29 Oct 2011 04:58:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) client-ip=81.2.115.146; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) smtp.mail=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1RK7YQ-0005Ks-Lt; Sat, 29 Oct 2011 12:58:26 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Aurelien Jarno Subject: [PATCH] ia64-dis.c: Undefine ABS to avoid clash with glib Date: Sat, 29 Oct 2011 12:58:26 +0100 Message-Id: <1319889506-20487-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 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