From 50c553be472c9f4b05a0526c0aae98709ca9ffff Mon Sep 17 00:00:00 2001 From: Roger Pau Monne Date: Thu, 7 Jun 2012 19:44:01 +0100 Subject: [PATCH] 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 Acked-by: Stefano Stabellini Acked-by: Ian Jackson --- sys-queue.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys-queue.h b/sys-queue.h index cb6a4c890..55c26fe7f 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 +#endif + #ifndef _SYS_QUEUE_H_ #define _SYS_QUEUE_H_ -- 2.39.5