From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36812) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYxRW-0008EY-Kb for qemu-devel@nongnu.org; Thu, 25 Feb 2016 10:03:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aYxRQ-0008PO-P6 for qemu-devel@nongnu.org; Thu, 25 Feb 2016 10:03:02 -0500 Received: from roura.ac.upc.edu ([147.83.33.10]:37960 helo=roura.ac.upc.es) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYxRQ-0008PD-BH for qemu-devel@nongnu.org; Thu, 25 Feb 2016 10:02:56 -0500 From: =?utf-8?b?TGx1w61z?= Vilanova Date: Thu, 25 Feb 2016 16:02:55 +0100 Message-Id: <145641257466.30097.3266368314823037062.stgit@localhost> In-Reply-To: <145641255678.30097.2919142707547689749.stgit@localhost> References: <145641255678.30097.2919142707547689749.stgit@localhost> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 2/6] disas: Remove unused macro '_' List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Eduardo Habkost , Stefan Hajnoczi , Richard Henderson Eliminates a future compilation error when UI code includes the tracing headers (indirectly pulling "disas/bfd.h" through "qom/cpu.h") and GLib's i18n '_' macro. Signed-off-by: Llu=C3=ADs Vilanova --- disas/i386.c | 2 +- include/disas/bfd.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/disas/i386.c b/disas/i386.c index d40b72a..8f4025a 100644 --- a/disas/i386.c +++ b/disas/i386.c @@ -3406,7 +3406,7 @@ static const struct dis386 three_byte_table[][256] = =3D { } }; =20 -#define INTERNAL_DISASSEMBLER_ERROR _("") +#define INTERNAL_DISASSEMBLER_ERROR "" =20 static void ckprefix (void) diff --git a/include/disas/bfd.h b/include/disas/bfd.h index a112e9c..a761d5b 100644 --- a/include/disas/bfd.h +++ b/include/disas/bfd.h @@ -477,7 +477,6 @@ int generic_symbol_at_address(bfd_vma, struct disasse= mble_info *); (INFO).disassembler_options =3D NULL, \ (INFO).insn_info_valid =3D 0 =20 -#define _(x) x #define ATTRIBUTE_UNUSED __attribute__((unused)) =20 /* from libbfd */