aboutsummaryrefslogtreecommitdiff
path: root/include/disas
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-07-19 15:04:36 +0100
committerPeter Maydell <peter.maydell@linaro.org>2016-07-19 16:40:39 +0100
commit5d3217340adcb6c4f0e4af5d2b865331eb2ff63d (patch)
tree78e4810548030d0e2f0e096cfbe7806b7b772bd7 /include/disas
parenta3b343772114c8c98986508f3352a631164f913c (diff)
downloadqemu-arm-5d3217340adcb6c4f0e4af5d2b865331eb2ff63d.tar.gz
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 <balaton@eik.bme.hu> Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Message-id: 1468937076-21503-1-git-send-email-peter.maydell@linaro.org
Diffstat (limited to 'include/disas')
-rw-r--r--include/disas/bfd.h2
1 files changed, 2 insertions, 0 deletions
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 */