From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45470) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQOJ8-0003QZ-Uf for qemu-devel@nongnu.org; Wed, 19 Mar 2014 17:46:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WQOJ3-0001ku-NW for qemu-devel@nongnu.org; Wed, 19 Mar 2014 17:45:54 -0400 Received: from cantor2.suse.de ([195.135.220.15]:58530 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQOJ3-0001kb-HM for qemu-devel@nongnu.org; Wed, 19 Mar 2014 17:45:49 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 19 Mar 2014 22:45:37 +0100 Message-Id: <1395265542-384-3-git-send-email-afaerber@suse.de> In-Reply-To: <1395265542-384-1-git-send-email-afaerber@suse.de> References: <1395265542-384-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL for-2.0 2/7] 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: =?UTF-8?q?Andreas=20F=C3=A4rber?= , Anthony Liguori , Marcel Apfelbaum From: Marcel Apfelbaum 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=C3=A4rber --- 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); =20 #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 0e82f06..e2e2ac7 100644 --- a/vl.c +++ b/vl.c @@ -58,6 +58,7 @@ int main(int argc, char **argv) =20 #include =20 +#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) =20 #include "disas/disas.h" =20 -#include "qemu/sockets.h" =20 #include "slirp/libslirp.h" =20 --=20 1.8.4.5