From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35238) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WPvvH-0007DA-Eg for qemu-devel@nongnu.org; Tue, 18 Mar 2014 11:27:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WPvvC-0005sP-MX for qemu-devel@nongnu.org; Tue, 18 Mar 2014 11:27:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:2241) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WPvvC-0005sI-EQ for qemu-devel@nongnu.org; Tue, 18 Mar 2014 11:27:18 -0400 From: Marcel Apfelbaum Date: Tue, 18 Mar 2014 17:26:35 +0200 Message-Id: <1395156395-24747-1-git-send-email-marcel.a@redhat.com> Subject: [Qemu-devel] [PATCH V2 for-2.0] vl.c: Fix OpenBSD compilation issue due to namespace collisions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, afaerber@suse.de, aliguori@amazon.com, brad@comstyle.com 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 --- V1 -> V2 #undef MACHINE to avoid introducing warnings for redefining the macro. 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 7bd2ea7..dd2c70d 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 f0fe48b..9f86e68 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" -- 1.8.3.1