diff options
| author | Jin Qian <jinqian@google.com> | 2017-10-09 17:45:04 -0700 |
|---|---|---|
| committer | Luca Stefani <luca.stefani.ge1@gmail.com> | 2018-01-21 15:20:27 +0100 |
| commit | 8e492e7b8fbc5bdcd4b259b9acf3e6e0b6863471 (patch) | |
| tree | 8d45430b79af439e78fdd78f1e570907d2d3c17f | |
| parent | 33c010c5f3a72255803af97e5acbcfe93b54de88 (diff) | |
| download | android_external_e2fsprogs-staging/lineage-15.1.tar.gz android_external_e2fsprogs-staging/lineage-15.1.tar.bz2 android_external_e2fsprogs-staging/lineage-15.1.zip | |
Fix build warnings with '__bitwise' macro redefinedstaging/lineage-15.1
external/e2fsprogs/lib/blkid/blkid_types.h:30:9:
warning: '__bitwise' macro redefined [-Wmacro-redefined]
external/e2fsprogs/lib/ext2fs/ext2_types.h:30:9:
warning: '__bitwise' macro redefined [-Wmacro-redefined]
Bug: 67046543
Change-Id: Ic8a552f68e6e17be4bdca63e24b45f6c9a6dbcd7
| -rw-r--r-- | lib/blkid/blkid_types.h | 4 | ||||
| -rw-r--r-- | lib/ext2fs/ext2_types.h | 4 | ||||
| -rw-r--r-- | lib/ext2fs/ext2_types.h.in | 6 |
3 files changed, 10 insertions, 4 deletions
diff --git a/lib/blkid/blkid_types.h b/lib/blkid/blkid_types.h index 8a8093ea..35eb145b 100644 --- a/lib/blkid/blkid_types.h +++ b/lib/blkid/blkid_types.h @@ -1,4 +1,4 @@ -/* +/* * If linux/types.h is already been included, assume it has defined * everything we need. (cross fingers) Other header files may have * also defined the types that we need. @@ -34,7 +34,9 @@ typedef __signed__ long long __s64; #define __bitwise __attribute__((bitwise)) #define __force __attribute__((force)) #else +#ifndef __bitwise #define __bitwise +#endif #define __force #endif diff --git a/lib/ext2fs/ext2_types.h b/lib/ext2fs/ext2_types.h index 9c3f7149..a43ed2fe 100644 --- a/lib/ext2fs/ext2_types.h +++ b/lib/ext2fs/ext2_types.h @@ -1,4 +1,4 @@ -/* +/* * If linux/types.h is already been included, assume it has defined * everything we need. (cross fingers) Other header files may have * also defined the types that we need. @@ -27,7 +27,9 @@ typedef __signed__ long long __s64; #define __bitwise __attribute__((bitwise)) #define __force __attribute__((force)) #else +#ifndef __bitwise #define __bitwise +#endif #define __force #endif diff --git a/lib/ext2fs/ext2_types.h.in b/lib/ext2fs/ext2_types.h.in index 07adc64a..e815ba65 100644 --- a/lib/ext2fs/ext2_types.h.in +++ b/lib/ext2fs/ext2_types.h.in @@ -1,6 +1,6 @@ -/* +/* * If linux/types.h is already been included, assume it has defined - * everything we need. (cross fingers) Other header files may have + * everything we need. (cross fingers) Other header files may have * also defined the types that we need. */ #if (!defined(_LINUX_TYPES_H) && !defined(_BLKID_TYPES_H) && \ @@ -176,7 +176,9 @@ typedef long __s64; #define __bitwise __attribute__((bitwise)) #define __force __attribute__((force)) #else +#ifndef __bitwise #define __bitwise +#endif #define __force #endif |