LU-5501 revert: blkid,ext2fs: avoid name clash with __u{8,16,32,64}

This reverts commit 5023510dd7f0ab40a216d3600ab665e2053cc070.

Temporarily revert this change for the Lustre e2fsprogs, since it
causes Lustre 2.5.3 (only) builds to fail in llverfs.c and llverdev.c.
They include <ext2fs/ext2fs.h>, which includes ext2-types.h, which
only conditionally declares __u32 et.al. with the patch applied.

The Lustre 2.5.3 config.h file defines HAVE___U32 et.al and config.h
is implicitly included into llverfs.c and llverdev.c by libtool in
the Makefile, but these __u* types are not actually declared in any
of the headers included by llverfs.c or llverdev.c, hence failure.

This patch can be dropped once http://review.whamcloud.com/11840
is landed and Lustre 2.5.4 is released.  It is not needed for b2_4-
(doesn't use libtool) or b2_6+ (removes HAVE___U* defines).

Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Change-Id: If16ac468d6b861d79bd84e7963729f5b46500c1e
Reviewed-on: http://review.whamcloud.com/11901
Tested-by: Jenkins
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: Jian Yu <jian.yu@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>

diff --git a/lib/blkid/blkid_types.h.in b/lib/blkid/blkid_types.h.in
index d4c81d0..2edc0da 100644 (file)
--- a/lib/blkid/blkid_types.h.in
+++ b/lib/blkid/blkid_types.h.in
@@ -9,26 +9,18 @@
 
 @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
@@ -38,15 +30,11 @@ 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
@@ -56,15 +44,12 @@ 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
@@ -77,16 +62,12 @@ 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
@@ -99,16 +80,12 @@ 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
@@ -120,17 +97,11 @@ 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
@@ -139,21 +110,17 @@ 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

diff --git a/lib/ext2fs/ext2_types.h.in b/lib/ext2fs/ext2_types.h.in
index 1320431..5b98f71 100644 (file)
--- a/lib/ext2fs/ext2_types.h.in
+++ b/lib/ext2fs/ext2_types.h.in
@@ -9,26 +9,18 @@
 
 @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
@@ -38,15 +30,11 @@ 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
@@ -56,15 +44,12 @@ 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
@@ -77,16 +62,12 @@ 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
@@ -99,16 +80,12 @@ 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
@@ -120,17 +97,11 @@ 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_LONG == 8 */
 #endif /* SIZEOF_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
@@ -146,14 +117,10 @@ typedef signed long long  __s64;
 #else
 #if (@SIZEOF_LONG@ == 8)
 typedef long           __s64;
-#else
-#undef HAVE___S64
- ?== error: undefined 64 bit type
 #endif /* SIZEOF_LONG_LONG == 8 */
 #endif /* SIZEOF_LONG == 8 */
 #endif /* SIZEOF_INT == 8 */
 #endif /* __S64_TYPEDEF */
-#endif /* HAVE___S64 */
 
 #undef __S8_TYPEDEF
 #undef __U8_TYPEDEF