diff options
| author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2021-06-24 21:46:23 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-24 21:46:23 (GMT) |
| commit | b16b7316c4afb7f59a4628ec5976659b8db3c497 (patch) | |
| tree | e8c018d152c44d2f1c29a863a465354bf8c748a7 | |
| parent | 5c3f4b3cb26f92fa0cc60f750816e122e8a68f8d (diff) | |
| download | hdf5-b16b7316c4afb7f59a4628ec5976659b8db3c497.zip hdf5-b16b7316c4afb7f59a4628ec5976659b8db3c497.tar.gz hdf5-b16b7316c4afb7f59a4628ec5976659b8db3c497.tar.bz2 | |
Reorganization of C and POSIX headers in H5public.h & H5private.h (#793)
* Reorganization of C and POSIX headers in H5public.h & H5private.h
Consolidated and removed duplicates
* It turns out Windows has sys/types.h
Co-authored-by: Larry Knox <lrknox@hdfgroup.org>
| -rw-r--r-- | src/H5private.h | 7 | ||||
| -rw-r--r-- | src/H5public.h | 26 |
2 files changed, 16 insertions, 17 deletions
diff --git a/src/H5private.h b/src/H5private.h index 327198d..f90aa94 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -31,21 +31,20 @@ #include <errno.h> #include <fcntl.h> #include <float.h> -#include <limits.h> #include <math.h> #include <signal.h> -#include <stdint.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <time.h> /* POSIX headers */ +#ifdef H5_HAVE_SYS_TIME_H +#include <sys/time.h> +#endif #ifdef H5_HAVE_UNISTD_H #include <pwd.h> #include <unistd.h> -#include <sys/time.h> -#include <sys/types.h> #include <sys/wait.h> #endif diff --git a/src/H5public.h b/src/H5public.h index cef15d9..e192de0 100644 --- a/src/H5public.h +++ b/src/H5public.h @@ -35,22 +35,23 @@ #include <features.h> /* For setting POSIX, BSD, etc. compatibility */ #endif -#ifdef H5_HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif - -#include <limits.h> /* For H5T_NATIVE_CHAR defn in H5Tpublic.h */ -#include <stdarg.h> /* For variadic functions in H5VLpublic.h */ - -#include <stdint.h> /* For C9x types */ - +/* C library header files for things that appear in HDF5 public headers */ #ifdef __cplusplus #define __STDC_FORMAT_MACROS #endif -#include <inttypes.h> /* C99/POSIX.1 header for uint64_t, PRIu64 */ - -#ifdef H5_HAVE_STDDEF_H +#include <inttypes.h> +#include <limits.h> +#include <stdarg.h> +#include <stdbool.h> #include <stddef.h> +#include <stdint.h> + +/* Unlike most sys/ headers, which are POSIX-only, sys/types.h is avaible + * on Windows, though it doesn't necessarily contain all the POSIX types + * we need for HDF5 (e.g. ssize_t). + */ +#ifdef H5_HAVE_SYS_TYPES_H +#include <sys/types.h> #endif #ifdef H5_HAVE_PARALLEL @@ -192,7 +193,6 @@ typedef int herr_t; * } * \endcode */ -#include <stdbool.h> typedef bool hbool_t; typedef int htri_t; |