From c8897e8eb965c0d091683ffaf127c50f8231d048 Mon Sep 17 00:00:00 2001 From: Marcel Apfelbaum Date: Tue, 18 Mar 2014 17:26:35 +0200 Subject: [PATCH] vl.c: Fix OpenBSD compilation issue due to namespace collisions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Marcel Apfelbaum Signed-off-by: Andreas Färber --- include/hw/boards.h | 1 + vl.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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 +#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"