diff options
author | Marcel Apfelbaum <marcel.a@redhat.com> | 2014-03-18 17:26:35 +0200 |
---|---|---|
committer | Andreas Färber <afaerber@suse.de> | 2014-03-19 21:00:34 +0100 |
commit | c8897e8eb965c0d091683ffaf127c50f8231d048 (patch) | |
tree | 76525dfd15050c28f70c697462f80936f43880bd /vl.c | |
parent | f5946dbab388050da6d9343978a38c81cce0508d (diff) |
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>
Diffstat (limited to 'vl.c')
-rw-r--r-- | vl.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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" |