From 84a083b5b1a505cb2e92611552fc41b545e3f4f6 Mon Sep 17 00:00:00 2001 From: "Darrick J. Wong" Date: Wed, 22 Feb 2017 14:39:01 -0600 Subject: [PATCH] include: don't collide __bitwise definitions in 4.10 Linux 4.10 changed the definition of __bitwise in such a way that xfsprogs' definition is no longer a strict match for it. This causes gcc to complain, so only #define it here if the system hasn't already done it for us. Signed-off-by: Darrick J. Wong Reviewed-by: Eric Sandeen Signed-off-by: Eric Sandeen --- include/xfs_arch.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/include/xfs_arch.h b/include/xfs_arch.h index 6e3172c67..12cd43e6c 100644 --- a/include/xfs_arch.h +++ b/include/xfs_arch.h @@ -25,10 +25,14 @@ #endif #ifdef __CHECKER__ -#define __bitwise __attribute__((bitwise)) +# ifndef __bitwise +# define __bitwise __attribute__((bitwise)) +# endif #define __force __attribute__((force)) #else -#define __bitwise +# ifndef __bitwise +# define __bitwise +# endif #define __force #endif -- 2.47.2