diff options
| -rw-r--r-- | src/H5private.h | 18 | ||||
| -rw-r--r-- | src/H5public.h | 20 |
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 */ |