| Message ID | 20170221180525.GG5846@birch.djwong.org (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
diff --git a/include/xfs_arch.h b/include/xfs_arch.h index 6e3172c..12cd43e 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
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 <darrick.wong@oracle.com> --- include/xfs_arch.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html