[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH] fix qemu build with nas installed
From: |
Stefan Hajnoczi |
Subject: |
Re: [Qemu-devel] [PATCH] fix qemu build with nas installed |
Date: |
Wed, 21 Sep 2011 11:16:37 +0100 |
On Wed, Sep 21, 2011 at 10:34 AM, Christoph Egger
<address@hidden> 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 <address@hidden>
>
> 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 <audio/audio.h> I could understand but I suspect we
have a mess of include paths that the compiler is searching and it
would be nice to fix that instead.
Stefan