From 5d194403e96d97f82681b5e7d96ddf8e48858cb7 Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Tue, 29 Nov 2011 15:20:48 -0800 Subject: contrib/uuid: Make sure that uuid_types.h are generated per system specific. Just the same way e2fsprogs maintains. This avoids unnecessary problems for different architectures. Change-Id: I3911998373756707996afb7b926ec0780ea18b81 BUG: 3833 Signed-off-by: Harshavardhana Reviewed-on: http://review.gluster.com/764 Tested-by: Gluster Build System Reviewed-by: Jeff Darcy Reviewed-by: Amar Tumballi --- contrib/uuid/uuid_types.h | 50 -------------------------------------------- contrib/uuid/uuid_types.h.in | 50 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 50 deletions(-) delete mode 100644 contrib/uuid/uuid_types.h create mode 100644 contrib/uuid/uuid_types.h.in (limited to 'contrib') diff --git a/contrib/uuid/uuid_types.h b/contrib/uuid/uuid_types.h deleted file mode 100644 index 3e2290b46..000000000 --- a/contrib/uuid/uuid_types.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * If linux/types.h is already been included, assume it has defined - * everything we need. (cross fingers) Other header files may have - * also defined the types that we need. - */ -#if (!defined(_STDINT_H) && !defined(_UUID_STDINT_H)) -#define _UUID_STDINT_H - -typedef unsigned char uint8_t; -typedef signed char int8_t; - -#if (4 == 8) -typedef int int64_t; -typedef unsigned int uint64_t; -#elif (8 == 8) -typedef long int64_t; -typedef unsigned long uint64_t; -#elif (8 == 8) -#if defined(__GNUC__) -typedef __signed__ long long int64_t; -#else -typedef signed long long int64_t; -#endif -typedef unsigned long long uint64_t; -#endif - -#if (4 == 2) -typedef int int16_t; -typedef unsigned int uint16_t; -#elif (2 == 2) -typedef short int16_t; -typedef unsigned short uint16_t; -#else - ?==error: undefined 16 bit type -#endif - -#if (4 == 4) -typedef int int32_t; -typedef unsigned int uint32_t; -#elif (8 == 4) -typedef long int32_t; -typedef unsigned long uint32_t; -#elif (2 == 4) -typedef short int32_t; -typedef unsigned short uint32_t; -#else - ?== error: undefined 32 bit type -#endif - -#endif diff --git a/contrib/uuid/uuid_types.h.in b/contrib/uuid/uuid_types.h.in new file mode 100644 index 000000000..f21ff4ee1 --- /dev/null +++ b/contrib/uuid/uuid_types.h.in @@ -0,0 +1,50 @@ +/* + * If linux/types.h is already been included, assume it has defined + * everything we need. (cross fingers) Other header files may have + * also defined the types that we need. + */ +#if (!defined(_STDINT_H) && !defined(_UUID_STDINT_H)) +#define _UUID_STDINT_H + +typedef unsigned char uint8_t; +typedef signed char int8_t; + +#if (@SIZEOF_INT@ == 8) +typedef int int64_t; +typedef unsigned int uint64_t; +#elif (@SIZEOF_LONG@ == 8) +typedef long int64_t; +typedef unsigned long uint64_t; +#elif (@SIZEOF_LONG_LONG@ == 8) +#if defined(__GNUC__) +typedef __signed__ long long int64_t; +#else +typedef signed long long int64_t; +#endif +typedef unsigned long long uint64_t; +#endif + +#if (@SIZEOF_INT@ == 2) +typedef int int16_t; +typedef unsigned int uint16_t; +#elif (@SIZEOF_SHORT@ == 2) +typedef short int16_t; +typedef unsigned short uint16_t; +#else + ?==error: undefined 16 bit type +#endif + +#if (@SIZEOF_INT@ == 4) +typedef int int32_t; +typedef unsigned int uint32_t; +#elif (@SIZEOF_LONG@ == 4) +typedef long int32_t; +typedef unsigned long uint32_t; +#elif (@SIZEOF_SHORT@ == 4) +typedef short int32_t; +typedef unsigned short uint32_t; +#else + ?== error: undefined 32 bit type +#endif + +#endif -- cgit