summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2006-11-22 18:20:15 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2006-11-22 18:20:15 (GMT)
commit2f694358c4c7ae4fa79057ae7d87f95859fbea73 (patch)
tree2409be120a8381561fafd1eea649d3d78add2244 /src
parentfffa958dc39c6c33f12fba0aa95a59e07b7b2233 (diff)
downloadhdf5-2f694358c4c7ae4fa79057ae7d87f95859fbea73.zip
hdf5-2f694358c4c7ae4fa79057ae7d87f95859fbea73.tar.gz
hdf5-2f694358c4c7ae4fa79057ae7d87f95859fbea73.tar.bz2
[svn-r12972] Description:
Move the definition of the typedef for uint64_t from H5private.h to H5public.h (to fix Windows builds) Tested on: None - just eyeballed.
Diffstat (limited to 'src')
-rw-r--r--src/H5private.h18
-rw-r--r--src/H5public.h20
2 files changed, 21 insertions, 17 deletions
diff --git a/src/H5private.h b/src/H5private.h
index 0a50b56..77fd02b 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -427,23 +427,7 @@
#endif
/* Definition of int64_t was moved to H5public.h */
-
-#if H5_SIZEOF_UINT64_T>=8
-#elif H5_SIZEOF_INT>=8
- typedef unsigned uint64_t;
-# undef H5_SIZEOF_UINT64_T
-# define H5_SIZEOF_UINT64_T H5_SIZEOF_INT
-#elif H5_SIZEOF_LONG>=8
- typedef unsigned long uint64_t;
-# undef H5_SIZEOF_UINT64_T
-# define H5_SIZEOF_UINT64_T H5_SIZEOF_LONG
-#elif H5_SIZEOF_LONG_LONG>=8
- typedef unsigned long_long uint64_t;
-# undef H5_SIZEOF_UINT64_T
-# define H5_SIZEOF_UINT64_T H5_SIZEOF_LONG_LONG
-#else
-# error "nothing appropriate for uint64_t"
-#endif
+/* Definition of uint64_t was moved to H5public.h */
/*
* Maximum and minimum values. These should be defined in <limits.h> for the
diff --git a/src/H5public.h b/src/H5public.h
index 46bbf3c..2030b67 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -227,6 +227,26 @@ typedef ssize_t hssize_t;
# error "nothing appropriate for int64_t"
#endif
+/* uint64_t type is used for fields for H5O_info_t. It may be
+ * defined in Posix.1g, otherwise it is defined here.
+ */
+#if H5_SIZEOF_UINT64_T>=8
+#elif H5_SIZEOF_INT>=8
+ typedef unsigned uint64_t;
+# undef H5_SIZEOF_UINT64_T
+# define H5_SIZEOF_UINT64_T H5_SIZEOF_INT
+#elif H5_SIZEOF_LONG>=8
+ typedef unsigned long uint64_t;
+# undef H5_SIZEOF_UINT64_T
+# define H5_SIZEOF_UINT64_T H5_SIZEOF_LONG
+#elif H5_SIZEOF_LONG_LONG>=8
+ typedef unsigned long_long uint64_t;
+# undef H5_SIZEOF_UINT64_T
+# define H5_SIZEOF_UINT64_T H5_SIZEOF_LONG_LONG
+#else
+# error "nothing appropriate for uint64_t"
+#endif
+
/* Common iteration orders */
typedef enum {
H5_ITER_UNKNOWN = -1, /* Unknown order */