diff options
| author | David Young <dyoung@hdfgroup.org> | 2020-02-10 22:59:14 (GMT) |
|---|---|---|
| committer | David Young <dyoung@hdfgroup.org> | 2020-02-10 22:59:14 (GMT) |
| commit | 4c7254b6eca3245d176d59a6a5390f42cd3e4b69 (patch) | |
| tree | 04578c09c974e24d551a6781e0ff895cc6ebc4cc /src | |
| parent | c7ad81b0ea0eab3a48a13b094aad65587f30aa27 (diff) | |
| parent | 3d2c0d7b0d3d41d88552d13d482bd264ec4e6269 (diff) | |
| download | hdf5-4c7254b6eca3245d176d59a6a5390f42cd3e4b69.zip hdf5-4c7254b6eca3245d176d59a6a5390f42cd3e4b69.tar.gz hdf5-4c7254b6eca3245d176d59a6a5390f42cd3e4b69.tar.bz2 | |
Make sure that H5TS_thread_id() is available as either a function or a macro in
all configurations.
(Merge remote-tracking branch 'origin/thread_id_everywhere' into vs2010-develop)
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5TS.c | 9 | ||||
| -rw-r--r-- | src/H5private.h | 5 |
2 files changed, 2 insertions, 12 deletions
@@ -639,13 +639,4 @@ H5TS_create_thread(void *(*func)(void *), H5TS_attr_t *attr, void *udata) } /* H5TS_create_thread */ -#else /* H5_HAVE_THREADSAFE */ - -uint64_t -H5TS_thread_id(void) -{ - return 0; -} - #endif /* H5_HAVE_THREADSAFE */ - 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 */ |