Commit c8897e8e authored by Marcel Apfelbaum's avatar Marcel Apfelbaum Committed by Andreas Färber
Browse files

vl.c: Fix OpenBSD compilation issue due to namespace collisions 



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: default avatarBrad Smith <brad@comstyle.com>
Signed-off-by: default avatarMarcel Apfelbaum <marcel.a@redhat.com>
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent f5946dba

include/hw/boards.h

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ struct QEMUMachine { 
int qemu_register_machine(QEMUMachine *m);



#define TYPE_MACHINE "machine"

#undef MACHINE  /* BSD defines it and QEMU does not use it */

#define MACHINE(obj) \

    OBJECT_CHECK(MachineState, (obj), TYPE_MACHINE)

#define MACHINE_GET_CLASS(obj) \

vl.c

+1 −1
Original line number Diff line number Diff line
@@ -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"