Re: [Qemu-devel] [PATCH for-2.0] vl.c: Fix OpenBSD compilation issue due to namespace collisions

[Peter Maydell]

On 18 March 2014 13:39, Marcel Apfelbaum <address@hidden> wrote:
> Machine rewriting added MACHINE macro which is
> already in use by other OpenBSD library.
> Since qemu/sockets.h exposes the OpenBSD namespace,
> the minimalistic approach is to add it as the first QEMU include.
>
> Reported-by: Brad Smith <address@hidden>
> Signed-off-by: Marcel Apfelbaum <address@hidden>
> ---
>  vl.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/vl.c b/vl.c
> index f0fe48b..9f86e68 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -58,6 +58,7 @@ int main(int argc, char **argv)
>
>  #include <glib.h>
>
> +#include "qemu/sockets.h"
>  #include "hw/hw.h"
>  #include "hw/boards.h"
>  #include "hw/usb.h"
> @@ -103,7 +104,6 @@ int main(int argc, char **argv)
>
>  #include "disas/disas.h"
>
> -#include "qemu/sockets.h"
>
>  #include "slirp/libslirp.h"

I'm confused; why doesn't this just result in a compiler
error in the other direction when we try to #define
MACHINE in QEMU and it's already been defined by
the BSD headers?

thanks
-- PMM