diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-09-15 14:49:13 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-09-15 14:49:13 (GMT) |
| commit | f0939c320dd3ad761aba4edfdbd63c4b2829f20c (patch) | |
| tree | 1f82bf453de01dc4cc56d9c17510f7ed34b11565 /src/H5private.h | |
| parent | 2e7ab5f65fbf01a45f45713d7b77062bb852e119 (diff) | |
| download | hdf5-f0939c320dd3ad761aba4edfdbd63c4b2829f20c.zip hdf5-f0939c320dd3ad761aba4edfdbd63c4b2829f20c.tar.gz hdf5-f0939c320dd3ad761aba4edfdbd63c4b2829f20c.tar.bz2 | |
[svn-r19385] Description:
Bring r19384 from trunk to 1.8 branch:
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 pthread side of 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 4f67326..518b503 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -1665,13 +1665,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 */ |