[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [qemu-xen-unstable] qemu-xen-trad: fix sys-queue.h usage on BSD systems
commit 50c553be472c9f4b05a0526c0aae98709ca9ffff Author: Roger Pau Monne <roger.pau@xxxxxxxxxx> Date: Thu Jun 7 19:44:01 2012 +0100 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@xxxxxxxxxx> Acked-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx> Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx> --- sys-queue.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/sys-queue.h b/sys-queue.h index cb6a4c8..55c26fe 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_ -- generated by git-patchbot for /home/xen/git/qemu-xen-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@xxxxxxxxxxxxx http://lists.xensource.com/xen-changelog
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |