libext2fs: explicitly ignore a possible unlink failure in ext2fs_free_icount

[tools/e2fsprogs.git] / lib / ext2fs / ext2_types.h.in

diff --git a/lib/ext2fs/ext2_types.h.in b/lib/ext2fs/ext2_types.h.in
index a00ed7f..98cc65b 100644 (file)
--- 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) && \
@@ -164,11 +164,23 @@ typedef long              __s64;
 #undef __S64_TYPEDEF
 #undef __U64_TYPEDEF
 
+#endif /* _*_TYPES_H */
+
+#include <stdint.h>
+
+/* endian checking stuff */
+#ifndef EXT2_ENDIAN_H_
+#define EXT2_ENDIAN_H_
+
 #ifdef __CHECKER__
-#define __bitwise              __attribute__((bitwise))
+# ifndef __bitwise
+#  define __bitwise            __attribute__((bitwise))
+# endif
 #define __force                        __attribute__((force))
 #else
-#define __bitwise
+# ifndef __bitwise
+#  define __bitwise
+# endif
 #define __force
 #endif
 
@@ -179,6 +191,6 @@ typedef __u16       __bitwise       __be16;
 typedef __u32  __bitwise       __be32;
 typedef __u64  __bitwise       __be64;
 
-#endif /* _*_TYPES_H */
+#endif /* EXT2_ENDIAN_H_ */
 
 @PUBLIC_CONFIG_HEADER@