[Qemu-commits] [qemu/qemu] 5d3217: disas: Fix ATTRIBUTE_UNUSED define clash with ALSA...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 5d3217340adcb6c4f0e4af5d2b865331eb2ff63d
      
https://github.com/qemu/qemu/commit/5d3217340adcb6c4f0e4af5d2b865331eb2ff63d
  Author: Peter Maydell <address@hidden>
  Date:   2016-07-19 (Tue, 19 Jul 2016)

  Changed paths:
    M disas/arm.c
    M include/disas/bfd.h

  Log Message:
  -----------
  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 <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Message-id: address@hidden