From: Roger Pau Monne <roger.pau@citrix.com>
Date: Thu, 7 Jun 2012 18:44:01 +0000 (+0100)
Subject: qemu-xen-trad: fix sys-queue.h usage on BSD systems
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=50c553be472c9f4b05a0526c0aae98709ca9ffff;p=people%2Fliuw%2Flibxenctrl-split%2Fqemu-xen-traditional.git

qemu-xen-trad: fix sys-queue.h usage on BSD systems

BSD systems already have a sys/queue.h file, which has more macros
than the one Qemu uses, and some header files depend on having that
macros defined (sys/disk.h for example). Disable sys-queue.h on BSD
systems and include the native one.

This is not a backport because the original patch is too dificult to
backport, it's commit 72cf2d4f0e181d0d3a3122e04129c58a95da713e.

Doing a diff -bB shows that the Qemu version is just a stripped
version of the original NetBSD header, with many macros removed, but
no new ones added.

Signed-off-by: Roger Pau Monne <roger.pau@citrix.com>
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---

diff --git a/sys-queue.h b/sys-queue.h
index cb6a4c89..55c26fe7 100644
--- a/sys-queue.h
+++ b/sys-queue.h
@@ -36,6 +36,12 @@
  *      @(#)queue.h     8.5 (Berkeley) 8/20/94
  */
 
+#include "config-host.h"
+#ifdef _BSD
+/* include native header before sys-queue.h */
+#include <sys/queue.h>
+#endif
+
 #ifndef _SYS_QUEUE_H_
 #define _SYS_QUEUE_H_