diff options
| author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2021-05-28 12:48:29 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-28 12:48:29 (GMT) |
| commit | e60ac6ec2d82fc1bcffcfecd353ff074f9011275 (patch) | |
| tree | 6ca93dbbb1ced5690bdd1f7ba4328fc8af0016a6 /src | |
| parent | 4454fca02a57663ea0dbcca01016788bd11703b9 (diff) | |
| download | hdf5-e60ac6ec2d82fc1bcffcfecd353ff074f9011275.zip hdf5-e60ac6ec2d82fc1bcffcfecd353ff074f9011275.tar.gz hdf5-e60ac6ec2d82fc1bcffcfecd353ff074f9011275.tar.bz2 | |
Removes pre-C99 build and header cruft (#700)
* Committing clang-format changes
* Removes pre-C99 build and header cruft
* Assumes ANSI C headers exist
* Assumes stdbool.h, stdint.h, and inttypes.h are present
* Assumes the C++ compiler can handle stdint.h
* Removes all work-arounds for missing functionality, especially stdbool.h
* Formats source
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5private.h | 12 | ||||
| -rw-r--r-- | src/H5public.h | 31 |
2 files changed, 6 insertions, 37 deletions
diff --git a/src/H5private.h b/src/H5private.h index a0b4e8e..7888772 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -41,10 +41,6 @@ #endif /* H5_HAVE_WIN32_API */ #endif /* H5_HAVE_THREADSAFE */ -/* - * Include ANSI-C header files. - */ -#ifdef H5_STDC_HEADERS #include <assert.h> #include <ctype.h> #include <errno.h> @@ -56,7 +52,6 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#endif /* * If _POSIX_VERSION is defined in unistd.h then this system is Posix.1 @@ -71,14 +66,7 @@ #include <pwd.h> #endif -/* - * C9x integer types - */ -#ifndef __cplusplus -#ifdef H5_HAVE_STDINT_H #include <stdint.h> -#endif -#endif /* * The `struct stat' data type for stat() and fstat(). This is a Posix file 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; |