diff options
| author | David Anderson <dvander@google.com> | 2018-07-12 12:22:22 -0700 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2018-08-05 12:20:39 -0400 |
| commit | dfae277e8b30272c8368a2f616f79e99d116cec8 (patch) | |
| tree | 9bb88fffc21e4760c2881a062fcb5fb5f4d6333e /util | |
| parent | 4a30e2ae7ced039189ee438065b2f656d83e7e44 (diff) | |
| download | android_external_e2fsprogs-dfae277e8b30272c8368a2f616f79e99d116cec8.tar.gz android_external_e2fsprogs-dfae277e8b30272c8368a2f616f79e99d116cec8.tar.bz2 android_external_e2fsprogs-dfae277e8b30272c8368a2f616f79e99d116cec8.zip | |
AOSP: Conditionally define __bitwise__ on Android.
bionic does not define _LINUX_TYPES_H but does define __bitwise, so we
conditionally define it here.
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Change-Id: I500ccd469ea7de2e53ab8bd75720a412c86cf18b
From AOSP commit: 77f2eea2717e18e80a31d80c7721b9e0ed8e0cba
Diffstat (limited to 'util')
| -rw-r--r-- | util/android_types.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/util/android_types.h b/util/android_types.h index 9c3f7149..a8d7cff1 100644 --- a/util/android_types.h +++ b/util/android_types.h @@ -24,10 +24,14 @@ typedef __signed__ long long __s64; #define EXT2_ENDIAN_H_ #ifdef __CHECKER__ +#ifndef __bitwise #define __bitwise __attribute__((bitwise)) +#endif #define __force __attribute__((force)) #else +#ifndef __bitwise #define __bitwise +#endif #define __force #endif |