diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2021-08-20 21:24:01 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-20 21:24:01 (GMT) |
| commit | 5df0118051f9d06799d2ca1172399e5067989b0e (patch) | |
| tree | d1bf917a0007b2c416e5e04609fbf1721ba3685b /src | |
| parent | 8dca25eaa5de660fc8d7bd650d412f89107cbc7f (diff) | |
| download | hdf5-5df0118051f9d06799d2ca1172399e5067989b0e.zip hdf5-5df0118051f9d06799d2ca1172399e5067989b0e.tar.gz hdf5-5df0118051f9d06799d2ca1172399e5067989b0e.tar.bz2 | |
1.10 Merge windows compiler fixes #912 (#915)
* Merge windows compiler fixes #912
* Merge changes to check for pwd.h header
* Add missing define
* Merge Remove incorrect compiler check for windows clang sanitizer #942
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5private.h | 2 | ||||
| -rw-r--r-- | src/H5public.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/H5private.h b/src/H5private.h index 60d270b..931d7b9 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -43,7 +43,9 @@ #include <sys/time.h> #endif #ifdef H5_HAVE_UNISTD_H +#ifdef H5_HAVE_PWD_H #include <pwd.h> +#endif #include <unistd.h> #include <sys/types.h> #include <sys/wait.h> diff --git a/src/H5public.h b/src/H5public.h index 6cb1004..6dffcf6 100644 --- a/src/H5public.h +++ b/src/H5public.h @@ -53,6 +53,7 @@ #ifdef H5_HAVE_SYS_TYPES_H #include <sys/types.h> #endif + #ifdef H5_HAVE_PARALLEL /* Don't link against MPI C++ bindings */ #define MPICH_SKIP_MPICXX 1 |