e2fsck: misc cleanups for pfsck

[tools/e2fsprogs.git] / util / android_types.h

diff --git a/util/android_types.h b/util/android_types.h
index 9c3f714..5f05903 100644 (file)
--- a/util/android_types.h
+++ b/util/android_types.h
@@ -4,8 +4,8 @@
  * also defined the types that we need.
  */
 #if (!defined(_LINUX_TYPES_H) && !defined(_BLKID_TYPES_H) && \
-       !defined(_EXT2_TYPES_H))
-#define _EXT2_TYPES_H
+       !defined(_EXT2_TYPES_H) && !defined(_UUID_TYPES_H))
+#define _LINUX_TYPES_H
 
 typedef unsigned char __u8;
 typedef __signed__ char __s8;
@@ -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