summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorHarshavardhana <fharshav@redhat.com>2011-11-29 15:20:48 -0800
committerAnand Avati <avati@gluster.com>2011-11-30 23:13:55 -0800
commit5d194403e96d97f82681b5e7d96ddf8e48858cb7 (patch)
treeaf719d6ddfeb488b44bb8019f7482ea107fe58ca /contrib
parentfbf6ce560dd6e72fc9d404e32d313732077a250f (diff)
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 <fharshav@redhat.com> Reviewed-on: http://review.gluster.com/764 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Jeff Darcy <jdarcy@redhat.com> Reviewed-by: Amar Tumballi <amar@gluster.com>
Diffstat (limited to 'contrib')
-rw-r--r--contrib/uuid/uuid_types.h.in (renamed from contrib/uuid/uuid_types.h)16
1 files changed, 8 insertions, 8 deletions
diff --git a/contrib/uuid/uuid_types.h b/contrib/uuid/uuid_types.h.in
index 3e2290b..f21ff4e 100644
--- a/contrib/uuid/uuid_types.h
+++ b/contrib/uuid/uuid_types.h.in
@@ -9,13 +9,13 @@
typedef unsigned char uint8_t;
typedef signed char int8_t;
-#if (4 == 8)
+#if (@SIZEOF_INT@ == 8)
typedef int int64_t;
typedef unsigned int uint64_t;
-#elif (8 == 8)
+#elif (@SIZEOF_LONG@ == 8)
typedef long int64_t;
typedef unsigned long uint64_t;
-#elif (8 == 8)
+#elif (@SIZEOF_LONG_LONG@ == 8)
#if defined(__GNUC__)
typedef __signed__ long long int64_t;
#else
@@ -24,23 +24,23 @@ typedef signed long long int64_t;
typedef unsigned long long uint64_t;
#endif
-#if (4 == 2)
+#if (@SIZEOF_INT@ == 2)
typedef int int16_t;
typedef unsigned int uint16_t;
-#elif (2 == 2)
+#elif (@SIZEOF_SHORT@ == 2)
typedef short int16_t;
typedef unsigned short uint16_t;
#else
?==error: undefined 16 bit type
#endif
-#if (4 == 4)
+#if (@SIZEOF_INT@ == 4)
typedef int int32_t;
typedef unsigned int uint32_t;
-#elif (8 == 4)
+#elif (@SIZEOF_LONG@ == 4)
typedef long int32_t;
typedef unsigned long uint32_t;
-#elif (2 == 4)
+#elif (@SIZEOF_SHORT@ == 4)
typedef short int32_t;
typedef unsigned short uint32_t;
#else