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 <darrick.wong@oracle.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/include/xfs_arch.h b/include/xfs_arch.h
index 6e3172c67bb2f8ba0bb924b2c99ee7ff6d066a95..12cd43e6c5e678ac8f95e42f66fe7ae6ef5f3288 100644 (file)
--- 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