diff options
| author | Jordan Henderson <jhenderson@hdfgroup.org> | 2020-02-05 20:15:16 (GMT) |
|---|---|---|
| committer | Jordan Henderson <jhenderson@hdfgroup.org> | 2020-02-05 22:07:33 (GMT) |
| commit | be0cd0b64aef3f64b15d5fc89cd15213ad939763 (patch) | |
| tree | 40f8887cb3125a297f67327097a97793c7b3d4be /src/H5Eint.c | |
| parent | 469c56d8a9378bd9ff74d6456aa9d8e598867da4 (diff) | |
| parent | 00608a8756330fc387cde90c397562103c857671 (diff) | |
| download | hdf5-be0cd0b64aef3f64b15d5fc89cd15213ad939763.zip hdf5-be0cd0b64aef3f64b15d5fc89cd15213ad939763.tar.gz hdf5-be0cd0b64aef3f64b15d5fc89cd15213ad939763.tar.bz2 | |
Merge branch 'develop' of ssh://git@bitbucket.hdfgroup.org:7999/~jhenderson/hdf5.git into 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 acd5b28..2aedc17 100644 --- a/src/H5Eint.c +++ b/src/H5Eint.c @@ -37,6 +37,7 @@ #include "H5Epkg.h" /* Error handling */ #include "H5Iprivate.h" /* IDs */ #include "H5MMprivate.h" /* Memory management */ +#include "H5TSprivate.h" /* Thread stuff */ /****************/ @@ -259,10 +260,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 */ @@ -391,10 +390,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 */ |