diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2020-07-20 21:06:54 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2020-07-20 21:06:54 (GMT) |
| commit | a3aedfff18d9e0f75f53a9b55ed8112bc991a26b (patch) | |
| tree | 62aa1bc5c0efbcddce3cf5b8440bf616f0bed08f /src/H5Eint.c | |
| parent | 09c266186d68e78055ba05d509e28ffe1589a27a (diff) | |
| download | hdf5-a3aedfff18d9e0f75f53a9b55ed8112bc991a26b.zip hdf5-a3aedfff18d9e0f75f53a9b55ed8112bc991a26b.tar.gz hdf5-a3aedfff18d9e0f75f53a9b55ed8112bc991a26b.tar.bz2 | |
Brought over thread-safety changes from develop.
Diffstat (limited to 'src/H5Eint.c')
| -rw-r--r-- | src/H5Eint.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/H5Eint.c b/src/H5Eint.c index d0880f5..2371a5f 100644 --- a/src/H5Eint.c +++ b/src/H5Eint.c @@ -36,6 +36,7 @@ #include "H5Epkg.h" /* Error handling */ #include "H5Iprivate.h" /* IDs */ #include "H5MMprivate.h" /* Memory management */ +#include "H5TSprivate.h" /* Thread stuff */ /****************/ @@ -258,10 +259,8 @@ H5E__walk1_cb(int n, H5E_error1_t *err_desc, void *client_data) else HDfprintf(stream, "thread 0"); } /* end block */ -#elif defined(H5_HAVE_THREADSAFE) - HDfprintf(stream, "thread %lu", (unsigned long)HDpthread_self_ulong()); #else - HDfprintf(stream, "thread 0"); + HDfprintf(stream, "thread %" PRIu64, H5TS_thread_id()); #endif HDfprintf(stream, ":\n"); } /* end if */ @@ -390,10 +389,8 @@ H5E__walk2_cb(unsigned n, const H5E_error2_t *err_desc, void *client_data) else HDfprintf(stream, "thread 0"); } /* end block */ -#elif defined(H5_HAVE_THREADSAFE) - HDfprintf(stream, "thread %lu", (unsigned long)HDpthread_self_ulong()); #else - HDfprintf(stream, "thread 0"); + HDfprintf(stream, "thread %" PRIu64, H5TS_thread_id()); #endif HDfprintf(stream, ":\n"); } /* end if */ |