aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Apfelbaum <marcel.a@redhat.com>2014-03-18 17:26:35 +0200
committerAndreas Färber <afaerber@suse.de>2014-03-19 21:00:34 +0100
commitc8897e8eb965c0d091683ffaf127c50f8231d048 (patch)
tree76525dfd15050c28f70c697462f80936f43880bd
parentf5946dbab388050da6d9343978a38c81cce0508d (diff)
downloadqemu-arm-c8897e8eb965c0d091683ffaf127c50f8231d048.tar.gz
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: Brad Smith <brad@comstyle.com> Signed-off-by: Marcel Apfelbaum <marcel.a@redhat.com> Signed-off-by: Andreas Färber <afaerber@suse.de>
-rw-r--r--include/hw/boards.h1
-rw-r--r--vl.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/include/hw/boards.h b/include/hw/boards.h
index 7bd2ea7736..dd2c70da36 100644
--- a/include/hw/boards.h
+++ b/include/hw/boards.h
@@ -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) \
diff --git a/vl.c b/vl.c
index 0e82f06989..e2e2ac799e 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"