diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2008-06-23 19:16:31 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2008-06-23 19:16:31 (GMT) |
| commit | 46d917001cc78bb7250167f755c12ae6dea6854c (patch) | |
| tree | 8f03c918de43ece1026803f66115b457b3573bc6 /src/H5Eint.c | |
| parent | a051d43645edb74483fcc2757fa267d081f527df (diff) | |
| download | hdf5-46d917001cc78bb7250167f755c12ae6dea6854c.zip hdf5-46d917001cc78bb7250167f755c12ae6dea6854c.tar.gz hdf5-46d917001cc78bb7250167f755c12ae6dea6854c.tar.bz2 | |
[svn-r15262] Description:
Merge revisions 15037:15130 from trunk into metadata journaling branch
Tested on:
FreeBSD/32 6.2 (duty) in debug mode
FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
in debug mode
Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Mac OS X/32 10.5.2 (amazon) in debug mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
Diffstat (limited to 'src/H5Eint.c')
| -rw-r--r-- | src/H5Eint.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/H5Eint.c b/src/H5Eint.c index 66fba91..34290a4 100644 --- a/src/H5Eint.c +++ b/src/H5Eint.c @@ -276,7 +276,9 @@ H5E_walk1_cb(int n, H5E_error1_t *err_desc, void *client_data) } /* end block */ #elif defined(H5_HAVE_THREADSAFE) #ifdef _WIN32 - fprintf(stream, "some thread: no way to know the thread number from pthread on windows"); + /* use GetCurrentThreadId because pthread_self return cannot be cast */ + /* as an unsigned long on Windows */ + fprintf(stream, "thread %lu", (unsigned long)GetCurrentThreadId()); #else fprintf(stream, "thread %lu", (unsigned long)pthread_self()); #endif @@ -396,7 +398,9 @@ H5E_walk2_cb(unsigned n, const H5E_error2_t *err_desc, void *client_data) } /* end block */ #elif defined(H5_HAVE_THREADSAFE) #ifdef _WIN32 - fprintf(stream, "some thread: no way to know the thread number from pthread on windows"); + /* use GetCurrentThreadId because pthread_self return cannot be cast */ + /* as an unsigned long on Windows */ + fprintf(stream, "thread %lu", (unsigned long)GetCurrentThreadId()); #else fprintf(stream, "thread %lu", (unsigned long)pthread_self()); #endif |