| Message ID | 145641257466.30097.3266368314823037062.stgit@localhost |
|---|---|
| State | New |
| Headers | show |
On Thu, Feb 25, 2016 at 04:02:55PM +0100, Lluís Vilanova wrote: > 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ís Vilanova <vilanova@ac.upc.edu> > --- > 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] = { > } > }; > > -#define INTERNAL_DISASSEMBLER_ERROR _("<internal disassembler error>") > +#define INTERNAL_DISASSEMBLER_ERROR "<internal disassembler error>" > > 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 disassemble_info *); > (INFO).disassembler_options = NULL, \ > (INFO).insn_info_valid = 0 > > -#define _(x) x > #define ATTRIBUTE_UNUSED __attribute__((unused)) > > /* from libbfd */ Did you forget to update disas/{mips,ppc,sparc,...}.c? Please build all targets to check.
Stefan Hajnoczi writes: > On Thu, Feb 25, 2016 at 04:02:55PM +0100, Lluís Vilanova wrote: >> 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ís Vilanova <vilanova@ac.upc.edu> >> --- >> 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] = { >> } >> }; >> >> -#define INTERNAL_DISASSEMBLER_ERROR _("<internal disassembler error>") >> +#define INTERNAL_DISASSEMBLER_ERROR "<internal disassembler error>" >> >> 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 disassemble_info *); >> (INFO).disassembler_options = NULL, \ >> (INFO).insn_info_valid = 0 >> >> -#define _(x) x >> #define ATTRIBUTE_UNUSED __attribute__((unused)) >> >> /* from libbfd */ > Did you forget to update disas/{mips,ppc,sparc,...}.c? > Please build all targets to check. Sorry, sems like something broke when I split this series and rebased it. I'll check all targets and resend the series. Thanks, Lluis
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] = { } }; -#define INTERNAL_DISASSEMBLER_ERROR _("<internal disassembler error>") +#define INTERNAL_DISASSEMBLER_ERROR "<internal disassembler error>" 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 disassemble_info *); (INFO).disassembler_options = NULL, \ (INFO).insn_info_valid = 0 -#define _(x) x #define ATTRIBUTE_UNUSED __attribute__((unused)) /* from libbfd */
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ís Vilanova <vilanova@ac.upc.edu> --- disas/i386.c | 2 +- include/disas/bfd.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-)