From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:44374)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <peter.maydell@linaro.org>) id 1bPYE2-0000Kq-7S
	for qemu-devel@nongnu.org; Tue, 19 Jul 2016 12:50:31 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <peter.maydell@linaro.org>) id 1bPYDx-0000cp-35
	for qemu-devel@nongnu.org; Tue, 19 Jul 2016 12:50:29 -0400
Received: from mail-vk0-x235.google.com ([2607:f8b0:400c:c05::235]:33044)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <peter.maydell@linaro.org>) id 1bPYDv-0000cg-Rx
	for qemu-devel@nongnu.org; Tue, 19 Jul 2016 12:50:25 -0400
Received: by mail-vk0-x235.google.com with SMTP id x130so33151572vkc.0
	for <qemu-devel@nongnu.org>; Tue, 19 Jul 2016 09:50:23 -0700 (PDT)
MIME-Version: 1.0
In-Reply-To: <20160719141714.GA23779@stefanha-x1.localdomain>
References: <1468937076-21503-1-git-send-email-peter.maydell@linaro.org>
	<20160719141714.GA23779@stefanha-x1.localdomain>
From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 19 Jul 2016 17:50:03 +0100
Message-ID: <CAFEAcA8BSa8OTxH-PyB0rAY3hTrBnX5C2SmpLdyw=fMELn=ysw@mail.gmail.com>
Content-Type: text/plain; charset=UTF-8
Subject: Re: [Qemu-devel] [PATCH] disas: Fix ATTRIBUTE_UNUSED define clash
 with ALSA headers
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Stefan Hajnoczi <stefanha@gmail.com>
Cc: QEMU Developers <qemu-devel@nongnu.org>, BALATON Zoltan <balaton@eik.bme.hu>, =?UTF-8?Q?Llu=C3=ADs_Vilanova?= <vilanova@ac.upc.edu>, Stefan Hajnoczi <stefanha@redhat.com>, Patch Tracking <patches@linaro.org>

On 19 July 2016 at 15:17, Stefan Hajnoczi <stefanha@gmail.com> wrote:
> On Tue, Jul 19, 2016 at 03:04:36PM +0100, Peter Maydell wrote:
>> 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>
>> ---
>>  disas/arm.c         | 1 -
>>  include/disas/bfd.h | 2 ++
>>  2 files changed, 2 insertions(+), 1 deletion(-)
>
> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>

Thanks; applied to master as a buildfix.

-- PMM