diff options
| author | Qu Wenruo <quwenruo@cn.fujitsu.com> | 2017-03-16 11:18:30 +0800 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2017-03-16 17:40:35 +0100 |
| commit | 1d1e2ef6bf021b3948b5122d5a7e87e15dfbbdff (patch) | |
| tree | 53d6e7e6d2b9103848f35389bb3370802f661b4a | |
| parent | c3d38a188024c3a3e85eb01c20e4b20f7abec000 (diff) | |
btrfs-progs: kerncompat: Fix re-definition of __bitwise
In latest linux api headers, __bitwise is already defined in
/usr/include/linux/types.h.
So kerncompat.h will re-define __bitwise, and cause gcc warning.
Fix it by checking if __bitwise is already define.
Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>
| -rw-r--r-- | kerncompat.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kerncompat.h b/kerncompat.h index 958bea43..fa96715f 100644 --- a/kerncompat.h +++ b/kerncompat.h @@ -317,11 +317,13 @@ static inline void assert_trace(const char *assertion, const char *filename, #define container_of(ptr, type, member) ({ \ const typeof( ((type *)0)->member ) *__mptr = (ptr); \ (type *)( (char *)__mptr - offsetof(type,member) );}) +#ifndef __bitwise #ifdef __CHECKER__ #define __bitwise __bitwise__ #else #define __bitwise -#endif +#endif /* __CHECKER__ */ +#endif /* __bitwise */ /* Alignment check */ #define IS_ALIGNED(x, a) (((x) & ((typeof(x))(a) - 1)) == 0) |