X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lib%2Fblkid%2Fblkid_types.h.in;h=d4c81d01b99b76ba334148905e01eacec8eba976;hb=766c14289119c6ecc362e0e5093ca82a51b5e1ca;hp=2edc0dad6083ce804d6a1b4ca093746d53996f2f;hpb=3a941bef3b9036ca3db9d510c71bcae801ea4dd1;p=tools%2Fe2fsprogs.git

diff --git a/lib/blkid/blkid_types.h.in b/lib/blkid/blkid_types.h.in
index 2edc0da..d4c81d0 100644
--- a/lib/blkid/blkid_types.h.in
+++ b/lib/blkid/blkid_types.h.in
@@ -9,18 +9,26 @@
 
 @ASM_TYPES_HEADER@
 
+#ifndef HAVE___U8
+#define HAVE___U8
 #ifdef __U8_TYPEDEF
 typedef __U8_TYPEDEF __u8;
 #else
 typedef unsigned char __u8;
 #endif
+#endif /* HAVE___U8 */
 
+#ifndef HAVE___S8
+#define HAVE___S8
 #ifdef __S8_TYPEDEF
 typedef __S8_TYPEDEF __s8;
 #else
 typedef signed char __s8;
 #endif
+#endif /* HAVE___S8 */
 
+#ifndef HAVE___U16
+#define HAVE___U16
 #ifdef __U16_TYPEDEF
 typedef __U16_TYPEDEF __u16;
 #else
@@ -30,11 +38,15 @@ typedef	unsigned int	__u16;
 #if (@SIZEOF_SHORT@ == 2)
 typedef	unsigned short	__u16;
 #else
+#undef HAVE___U16
   ?==error: undefined 16 bit type
 #endif /* SIZEOF_SHORT == 2 */
 #endif /* SIZEOF_INT == 2 */
 #endif /* __U16_TYPEDEF */
+#endif /* HAVE___U16 */
 
+#ifndef HAVE___S16
+#define HAVE___S16
 #ifdef __S16_TYPEDEF
 typedef __S16_TYPEDEF __s16;
 #else
@@ -44,12 +56,15 @@ typedef	int		__s16;
 #if (@SIZEOF_SHORT@ == 2)
 typedef	short		__s16;
 #else
+#undef HAVE___S16
   ?==error: undefined 16 bit type
 #endif /* SIZEOF_SHORT == 2 */
 #endif /* SIZEOF_INT == 2 */
 #endif /* __S16_TYPEDEF */
+#endif /* HAVE___S16 */
 
-
+#ifndef HAVE___U32
+#define HAVE___U32
 #ifdef __U32_TYPEDEF
 typedef __U32_TYPEDEF __u32;
 #else
@@ -62,12 +77,16 @@ typedef	unsigned long	__u32;
 #if (@SIZEOF_SHORT@ == 4)
 typedef	unsigned short	__u32;
 #else
+#undef HAVE___U32
  ?== error: undefined 32 bit type
 #endif /* SIZEOF_SHORT == 4 */
 #endif /* SIZEOF_LONG == 4 */
 #endif /* SIZEOF_INT == 4 */
 #endif /* __U32_TYPEDEF */
+#endif /* HAVE___U32 */
 
+#ifndef HAVE___S32
+#define HAVE___S32
 #ifdef __S32_TYPEDEF
 typedef __S32_TYPEDEF __s32;
 #else
@@ -80,12 +99,16 @@ typedef	long		__s32;
 #if (@SIZEOF_SHORT@ == 4)
 typedef	short		__s32;
 #else
+#undef HAVE___S32
  ?== error: undefined 32 bit type
 #endif /* SIZEOF_SHORT == 4 */
 #endif /* SIZEOF_LONG == 4 */
 #endif /* SIZEOF_INT == 4 */
 #endif /* __S32_TYPEDEF */
+#endif /* HAVE___S32 */
 
+#ifndef HAVE___U64
+#define HAVE___U64
 #ifdef __U64_TYPEDEF
 typedef __U64_TYPEDEF __u64;
 #else
@@ -97,11 +120,17 @@ typedef unsigned long long	__u64;
 #else
 #if (@SIZEOF_LONG@ == 8)
 typedef unsigned long	__u64;
+#else
+#undef HAVE___U64
+ ?== error: undefined 64 bit type
 #endif /* SIZEOF_LONG == 8 */
 #endif /* SIZEOF_LONG_LONG == 8 */
 #endif /* SIZEOF_INT == 8 */
 #endif /* __U64_TYPEDEF */
+#endif /* HAVE___U64 */
 
+#ifndef HAVE___S64
+#define HAVE___S64
 #ifdef __S64_TYPEDEF
 typedef __S64_TYPEDEF __s64;
 #else
@@ -110,17 +139,21 @@ typedef int		__s64;
 #else
 #if (@SIZEOF_LONG_LONG@ == 8)
 #if defined(__GNUC__)
-typedef __signed__ long long 	__s64;
+typedef __signed__ long long	__s64;
 #else
-typedef signed long long 	__s64;
+typedef signed long long	__s64;
 #endif /* __GNUC__ */
 #else
 #if (@SIZEOF_LONG@ == 8)
 typedef long		__s64;
+#else
+#undef HAVE___S64
+ ?== error: undefined 64 bit type
 #endif /* SIZEOF_LONG == 8 */
 #endif /* SIZEOF_LONG_LONG == 8 */
 #endif /* SIZEOF_INT == 8 */
 #endif /* __S64_TYPEDEF */
+#endif /* HAVE___S64 */
 
 #undef __S8_TYPEDEF
 #undef __U8_TYPEDEF