From 5d3217340adcb6c4f0e4af5d2b865331eb2ff63d Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Tue, 19 Jul 2016 15:04:36 +0100 Subject: disas: Fix ATTRIBUTE_UNUSED define clash with ALSA headers disas/bfd.h defines ATTRIBUTE_UNUSED, but unfortunately the ALSA system headers also define this macro, which means that you can get a compilation failure if building with ALSA and any files happen to include the alsa headers before bfd.h rather than the other way around. This is unfortunate namespace pollution by the ALSA headers but we can work around it. Add an #ifndef guard to bfd.h and remove the unnecessary extra definition in disas/arm.c to fix this. Reported-by: BALATON Zoltan Signed-off-by: Peter Maydell Reviewed-by: Stefan Hajnoczi Message-id: 1468937076-21503-1-git-send-email-peter.maydell@linaro.org --- include/disas/bfd.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include') diff --git a/include/disas/bfd.h b/include/disas/bfd.h index 231e5fbf91..8a3488c2c5 100644 --- a/include/disas/bfd.h +++ b/include/disas/bfd.h @@ -477,7 +477,9 @@ int generic_symbol_at_address(bfd_vma, struct disassemble_info *); (INFO).disassembler_options = NULL, \ (INFO).insn_info_valid = 0 +#ifndef ATTRIBUTE_UNUSED #define ATTRIBUTE_UNUSED __attribute__((unused)) +#endif /* from libbfd */ -- cgit v1.2.3