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

diff --git a/util/android_types.h b/util/android_types.h
index 9c3f7149eb7e245db0858a6f7397c8e07ecdf531..a8d7cff1fa5f7aec1faf579e5c444bbb8e3ec51d 100644 (file)
--- 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