Re: [Xen-devel] [PATCH] qemu-xen-trad: fix sys-queue.h usage on BSD systems

[Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>]

On Wed, 30 May 2012, Roger Pau Monne wrote:
> 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.

The upstream commit message states:

"Problem: Our file sys-queue.h is a copy of the BSD file, but there are
some additions and it's not entirely compatible. Because of that, there
have been conflicts with system headers on BSD systems."

Wouldn't this be a problem if we apply the simple patch below?


> Cc: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
> Signed-off-by: Roger Pau Monne <roger.pau@xxxxxxxxxx>
> ---
>  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_
>  
> -- 
> 1.7.7.5 (Apple Git-26)
> 

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel