From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:55230) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R8Su9-0007YD-25 for qemu-devel@nongnu.org; Tue, 27 Sep 2011 04:20:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R8Su3-0004NI-93 for qemu-devel@nongnu.org; Tue, 27 Sep 2011 04:20:41 -0400 Received: from am1ehsobe004.messaging.microsoft.com ([213.199.154.207]:54813 helo=AM1EHSOBE004.bigfish.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R8Su2-0004MW-Uz for qemu-devel@nongnu.org; Tue, 27 Sep 2011 04:20:35 -0400 Message-ID: <4E81874A.7000502@amd.com> Date: Tue, 27 Sep 2011 10:20:26 +0200 From: Christoph Egger MIME-Version: 1.0 References: <4E79AF93.4030207@amd.com> In-Reply-To: Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] fix qemu build with nas installed List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Hajnoczi Cc: "qemu-devel@nongnu.org" On 09/21/11 12:16, Stefan Hajnoczi wrote: > On Wed, Sep 21, 2011 at 10:34 AM, Christoph Egger > wrote: >> >> When NAS (http://nas.sf.net) is installed then there >> is an existing audio/audio.h. Then when compiling >> qemu, #include "audio/audio.h" takes the one from NAS >> and causes the build to fail. >> >> So rename audio/audio.h to audio/qaudio.h and adjust >> all users. >> >> Signed-off-by: Christoph Egger >> >> diff --git a/arch_init.c b/arch_init.c >> index 9a5a0e3..516c4c0 100644 >> --- a/arch_init.c >> +++ b/arch_init.c >> @@ -32,7 +32,7 @@ >> #include "monitor.h" >> #include "sysemu.h" >> #include "arch_init.h" >> -#include "audio/audio.h" >> +#include "audio/qaudio.h" > > It's not looking for system headers so why is > /usr/include/audio/audio.h getting picked up instead of > ./audio/audio.h? > > If it was #include