diff options
| author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2023-01-05 16:59:24 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-05 16:59:24 (GMT) |
| commit | 363b26fa0d9dadcd96e611ed38956afeaa94851a (patch) | |
| tree | 2f9b78073d3fc557b909d1031e205d67ca9eaba7 | |
| parent | bdf28749c976e5db22432de7f6cc59c6a654b86b (diff) | |
| download | hdf5-363b26fa0d9dadcd96e611ed38956afeaa94851a.zip hdf5-363b26fa0d9dadcd96e611ed38956afeaa94851a.tar.gz hdf5-363b26fa0d9dadcd96e611ed38956afeaa94851a.tar.bz2 | |
Minor change to H5private.h to bring in line with develop (#2391)
| -rw-r--r-- | src/H5private.h | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/src/H5private.h b/src/H5private.h index e470f17..f54c6df 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -26,25 +26,6 @@ #include "H5public.h" /* Include Public Definitions */ -/* include the pthread header */ -#ifdef H5_HAVE_THREADSAFE -#ifdef H5_HAVE_WIN32_API -#ifndef H5_HAVE_WIN_THREADS -#ifdef H5_HAVE_PTHREAD_H -#include <pthread.h> -#endif /* H5_HAVE_PTHREAD_H */ -#endif /* H5_HAVE_WIN_THREADS */ -#else /* H5_HAVE_WIN32_API */ -#ifdef H5_HAVE_PTHREAD_H -#include <pthread.h> -#endif /* H5_HAVE_PTHREAD_H */ -#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 +37,6 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#endif /* POSIX headers */ #ifdef H5_HAVE_SYS_TIME_H @@ -82,6 +62,11 @@ #endif #endif +/* Include the Pthreads header, if necessary */ +#if defined(H5_HAVE_THREADSAFE) && defined(H5_HAVE_PTHREAD_H) +#include <pthread.h> +#endif + /* * The `struct stat' data type for stat() and fstat(). This is a POSIX file * but often appears on non-POSIX systems also. The `struct stat' is required |