diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2014-04-11 19:04:54 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2014-04-11 19:04:54 (GMT) |
| commit | f466a5d298885c4d3dd813c0e6c8db9319cade50 (patch) | |
| tree | 770e2cec48a2a6497ad1e0ce6175b5ec6d4424e4 /src/H5private.h | |
| parent | 17a1f1a5976b98db1788200f0b015694f85cb008 (diff) | |
| download | hdf5-f466a5d298885c4d3dd813c0e6c8db9319cade50.zip hdf5-f466a5d298885c4d3dd813c0e6c8db9319cade50.tar.gz hdf5-f466a5d298885c4d3dd813c0e6c8db9319cade50.tar.bz2 | |
[svn-r25018] Purpose:
Merged r24893, r24961, r24965 from trunk.
Fix for thread-local storage resource leaks on Windows with Win32 threads.
Prohibits thread-safe + C++/Fortran/static library in CMake.
Tested on:
64-bit Windows 7 w/ Visual Studio 2012
Diffstat (limited to 'src/H5private.h')
| -rw-r--r-- | src/H5private.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/H5private.h b/src/H5private.h index f8ede63..18a0fc0 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -1730,7 +1730,7 @@ typedef struct H5_api_struct { /* Macro for first thread initialization */ #ifdef H5_HAVE_WIN_THREADS -#define H5_FIRST_THREAD_INIT InitOnceExecuteOnce(&H5TS_first_init_g, H5TS_win32_first_thread_init, NULL, NULL); +#define H5_FIRST_THREAD_INIT InitOnceExecuteOnce(&H5TS_first_init_g, H5TS_win32_process_enter, NULL, NULL); #else #define H5_FIRST_THREAD_INIT pthread_once(&H5TS_first_init_g, H5TS_pthread_first_thread_init); #endif |