From: Darrick J. Wong <darrick.wong@oracle.com>
Date: Wed, 22 Feb 2017 20:39:01 +0000 (-0600)
Subject: include: don't collide __bitwise definitions in 4.10
X-Git-Tag: v4.10.0~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;ds=sidebyside;h=84a083b5b1a505cb2e92611552fc41b545e3f4f6;p=thirdparty%2Fxfsprogs-dev.git

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 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