From mboxrd@z Thu Jan 1 00:00:00 1970 From: Roger Pau Monne Subject: [PATCH] qemu-xen-trad: fix sys-queue.h usage on BSD systems Date: Wed, 30 May 2012 17:12:12 +0100 Message-ID: <1338394332-22422-1-git-send-email-roger.pau@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: Stefano Stabellini , Roger Pau Monne List-Id: xen-devel@lists.xenproject.org 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. Cc: Stefano Stabellini Signed-off-by: Roger Pau Monne --- 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 +#endif + #ifndef _SYS_QUEUE_H_ #define _SYS_QUEUE_H_ -- 1.7.7.5 (Apple Git-26)