diff options
| author | David Young <dyoung@hdfgroup.org> | 2020-02-17 16:47:29 (GMT) |
|---|---|---|
| committer | David Young <dyoung@hdfgroup.org> | 2020-02-17 16:47:29 (GMT) |
| commit | 47b79b7422c91e53ae5d87bcda45d52798a64fb6 (patch) | |
| tree | e00ad2dc80ba285fb12d7dfa1a7be7402c0f28e6 /src/H5private.h | |
| parent | fa2b89c6b0c894915f12a1df594ef8c427adbc2d (diff) | |
| parent | b4697f969295245840350e17d75d92a0fdd7e7a9 (diff) | |
| download | hdf5-47b79b7422c91e53ae5d87bcda45d52798a64fb6.zip hdf5-47b79b7422c91e53ae5d87bcda45d52798a64fb6.tar.gz hdf5-47b79b7422c91e53ae5d87bcda45d52798a64fb6.tar.bz2 | |
Merge pull request #2369 in HDFFV/hdf5 from ~DYOUNG/vs2010:develop to develop
Merged per discussion with Elena.
* commit 'b4697f969295245840350e17d75d92a0fdd7e7a9':
Use HD prefix.
Delete unhelpful comment per Jordan's question.
Make sure that H5TS_thread_id() is available as either a function or a macro in all configurations.
Provide local copies of err(3)- and errx(3)-alike functions for Visual Studio compatibility.
Provide C99/POSIX.1 format strings PRI[doux]{8,16,32,64,MAX,PTR} on systems that are missing <inttypes.h>.
Diffstat (limited to 'src/H5private.h')
| -rw-r--r-- | src/H5private.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/H5private.h b/src/H5private.h index f0f3687..700fe8a 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -1897,12 +1897,11 @@ H5_DLL double H5_trace(const double *calltime, const char *func, const char *typ /* global library version information string */ extern char H5_lib_vers_info_g[]; +#include "H5TSprivate.h" + /* Lock headers */ #ifdef H5_HAVE_THREADSAFE -/* Include required thread-safety header */ -#include "H5TSprivate.h" - /* replacement structure for original global variable */ typedef struct H5_api_struct { H5TS_mutex_t init_lock; /* API entrance mutex */ |