Re: [PATCH v2 1/4] xfsprogs: Prefix LIST_... macros to XFS_LIST_...

[Dave Chinner <david@fromorbit.com>]

On Mon, Jul 20, 2015 at 02:56:55PM +0200, Jan Tulak wrote:
> OS X has some conflicting LIST_ macros, so prefix the XFS ones.

What macros, and how do we get them included in the build? I
shouldn't need to go and use google to work out why a change is
beign made....

> Signed-off-by: Jan Tulak <jtulak@redhat.com>
> ---
>  include/list.h  | 6 +++---
>  repair/phase6.c | 2 +-
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/include/list.h b/include/list.h
> index 3f087a4..7e9f748 100644
> --- a/include/list.h
> +++ b/include/list.h
> @@ -27,10 +27,10 @@ struct list_head {
>  	struct list_head *prev;
>  };
>  
> -#define LIST_HEAD_INIT(name) { &(name), &(name) }
> +#define XFS_LIST_HEAD_INIT(name) { &(name), &(name) }
>  
> -#define LIST_HEAD(name) \
> -		struct list_head name = LIST_HEAD_INIT(name)
> +#define XFS_LIST_HEAD(name) \
> +		struct list_head name = XFS_LIST_HEAD_INIT(name)
>  
>  #define INIT_LIST_HEAD(list) list_head_init(list)
>  static inline void list_head_init(struct list_head *list)

This is supposed to match what is required for libxfs/ so we don't
have to modify the kernel code we bring across. Without knowing
exactly how we are including conflicting definitions from the OS X
include files, it's really hard to suggest other possible
solutions...

Cheers,

Dave.
-- 
Dave Chinner
david@fromorbit.com

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs