diff options
author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2021-05-28 15:48:51 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-28 15:48:51 (GMT) |
commit | f86004dbde46d4aff365cc7d0a5c503ff60d3416 (patch) | |
tree | 44f69fe2bdba7e91ef1aec46f8c19e8adaee6389 /src/H5public.h | |
parent | 2ddf5fbd92ebdb0d59e208d88f159eec8a1ffbf8 (diff) | |
download | hdf5-f86004dbde46d4aff365cc7d0a5c503ff60d3416.zip hdf5-f86004dbde46d4aff365cc7d0a5c503ff60d3416.tar.gz hdf5-f86004dbde46d4aff365cc7d0a5c503ff60d3416.tar.bz2 |
Normalization with develop (#704)
Diffstat (limited to 'src/H5public.h')
-rw-r--r-- | src/H5public.h | 31 |
1 files changed, 6 insertions, 25 deletions
diff --git a/src/H5public.h b/src/H5public.h index ada15a7..33f8b37 100644 --- a/src/H5public.h +++ b/src/H5public.h @@ -34,28 +34,21 @@ #ifdef H5_HAVE_FEATURES_H #include <features.h> /* For setting POSIX, BSD, etc. compatibility */ #endif + #ifdef H5_HAVE_SYS_TYPES_H #include <sys/types.h> #endif -#ifdef H5_STDC_HEADERS + #include <limits.h> /* For H5T_NATIVE_CHAR defn in H5Tpublic.h */ #include <stdarg.h> /* For variadic functions in H5VLpublic.h */ -#endif -#ifndef __cplusplus -#ifdef H5_HAVE_STDINT_H -#include <stdint.h> /* For C9x types */ -#endif -#else -#ifdef H5_HAVE_STDINT_H_CXX -#include <stdint.h> /* For C9x types (when included from C++) */ -#endif -#endif -#ifdef H5_HAVE_INTTYPES_H + +#include <stdint.h> /* For C9x types */ #include <inttypes.h> /* C99/POSIX.1 header for uint64_t, PRIu64 */ -#endif + #ifdef H5_HAVE_STDDEF_H #include <stddef.h> #endif + #ifdef H5_HAVE_PARALLEL /* Don't link against MPI C++ bindings */ #define MPICH_SKIP_MPICXX 1 @@ -220,19 +213,7 @@ typedef int herr_t; * } * \endcode */ -#ifdef H5_HAVE_STDBOOL_H #include <stdbool.h> -#else /* H5_HAVE_STDBOOL_H */ -#ifndef __cplusplus -#if defined(H5_SIZEOF_BOOL) && (H5_SIZEOF_BOOL != 0) -#define bool _Bool -#else -#define bool unsigned int -#endif -#define true 1 -#define false 0 -#endif /* __cplusplus */ -#endif /* H5_HAVE_STDBOOL_H */ typedef bool hbool_t; typedef int htri_t; |