diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2014-06-13 16:10:25 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2014-06-13 16:10:25 (GMT) |
| commit | 1ef0d8e245a965666a0cb8bc6ecef55ccb8184c3 (patch) | |
| tree | e27e2f39abcf411bec0b41eaedd78bc76979875b /src | |
| parent | 79c3535fe30c93a84ea5372279bff1778a85e64d (diff) | |
| download | hdf5-1ef0d8e245a965666a0cb8bc6ecef55ccb8184c3.zip hdf5-1ef0d8e245a965666a0cb8bc6ecef55ccb8184c3.tar.gz hdf5-1ef0d8e245a965666a0cb8bc6ecef55ccb8184c3.tar.bz2 | |
[svn-r25276] Merge of r25274 from trunk.
Eliminates DllMain from static builds (an oversight in the implementation). Fixes HDFFV-8837.
Tested on 64-bit Windows 7 with Visual Studio 2012.
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -840,7 +840,8 @@ H5free_memory(void *mem) } /* end H5free_memory() */ -#ifdef H5_HAVE_WIN32_API +#if defined(H5_HAVE_THREADSAFE) && defined(H5_BUILT_AS_DYNAMIC_LIB) \ + && defined(H5_HAVE_WIN32_API) && defined(H5_HAVE_WIN_THREADS) /*------------------------------------------------------------------------- * Function: DllMain * @@ -895,4 +896,4 @@ DllMain(_In_ HINSTANCE hinstDLL, _In_ DWORD fdwReason, _In_ LPVOID lpvReserved) return fOkay; } -#endif /* H5_HAVE_WIN32_API */ +#endif /* H5_HAVE_WIN32_API && H5_BUILT_AS_DYNAMIC_LIB && H5_HAVE_WIN_THREADS && H5_HAVE_THREADSAFE*/ |