diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-09-15 13:51:11 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-09-15 13:51:11 (GMT) |
| commit | 96c26d2b17f28af6a25a7cd61449b1bac06b996d (patch) | |
| tree | c8ded7151713faef770219052a328fcfffcc7dc7 /src/H5private.h | |
| parent | c55acc2d036e5ca6b277d2ee466a58d7bb168c57 (diff) | |
| download | hdf5-96c26d2b17f28af6a25a7cd61449b1bac06b996d.zip hdf5-96c26d2b17f28af6a25a7cd61449b1bac06b996d.tar.gz hdf5-96c26d2b17f28af6a25a7cd61449b1bac06b996d.tar.bz2 | |
[svn-r19384] Description:
Correct an error I convinced Mike to introduce with the phread_once()
code, :-( along with another one that wasn't my fault. Also, clean up
warnings and restructure code in the thread-safe code a bit.
Tested on:
Mac OS X/32 10.6.4 (amazon) w/production + thread-safe
(not a configuration that h5committest tests)
Diffstat (limited to 'src/H5private.h')
| -rw-r--r-- | src/H5private.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/H5private.h b/src/H5private.h index cc36d16..d506a59 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -1671,13 +1671,9 @@ typedef struct H5_api_struct { /* Macro for first thread initialization */ #ifdef H5_HAVE_WIN_THREADS -#define H5_FIRST_THREAD_INIT \ - if (!H5_INIT_GLOBAL) \ - InitOnceExecuteOnce(&H5TS_first_init_g, H5TS_win32_first_thread_init, NULL, NULL); +#define H5_FIRST_THREAD_INIT InitOnceExecuteOnce(&H5TS_first_init_g, H5TS_win32_first_thread_init, NULL, NULL); #else -#define H5_FIRST_THREAD_INIT \ - if (!H5_INIT_GLOBAL) \ - pthread_once(&H5TS_first_init_g, H5TS_first_thread_init); +#define H5_FIRST_THREAD_INIT pthread_once(&H5TS_first_init_g, H5TS_pthread_first_thread_init); #endif /* Macros for threadsafe HDF-5 Phase I locks */ |