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

[Marcel Apfelbaum <marcel.a@redhat.com>]

On Tue, 2014-03-18 at 13:57 +0000, Peter Maydell wrote:
> On 18 March 2014 13:39, Marcel Apfelbaum <marcel.a@redhat.com> 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 <brad@comstyle.com>
> > Signed-off-by: Marcel Apfelbaum <marcel.a@redhat.com>
> > ---
> >  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?
Maybe because there is usage of the "MACHINE" define by the BSD
library? (on Qemu context, of course! - meaning, it shouldn't even be
exposed in the first place!)

Thanks,
Marcel

> 
> thanks
> -- PMM