From: David Anderson <dvander@google.com>
Date: Thu, 12 Jul 2018 19:22:22 +0000 (-0700)
Subject: AOSP: Conditionally define __bitwise__ on Android.
X-Git-Tag: v1.44.4~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dfae277e8b30272c8368a2f616f79e99d116cec8;p=thirdparty%2Fe2fsprogs.git

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 9c3f7149e..a8d7cff1f 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