diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2014-06-13 15:48:28 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2014-06-13 15:48:28 (GMT) |
| commit | 8df5a96ccb3d60bc38d9f1b6d0d774d55afbb7a6 (patch) | |
| tree | e832fadb71d5b27a087e14c2b679a67e20f906ac /src/H5.c | |
| parent | 3e1e5f166a1316573ea81b96178bb6a4fa3654a2 (diff) | |
| parent | 25ba47bc97bd7dd3f9f9ee0c13d04c1ea041dd7b (diff) | |
| download | hdf5-8df5a96ccb3d60bc38d9f1b6d0d774d55afbb7a6.zip hdf5-8df5a96ccb3d60bc38d9f1b6d0d774d55afbb7a6.tar.gz hdf5-8df5a96ccb3d60bc38d9f1b6d0d774d55afbb7a6.tar.bz2 | |
[svn-r25275] merge from trunk.
Diffstat (limited to 'src/H5.c')
| -rw-r--r-- | src/H5.c | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -845,7 +845,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 * @@ -854,6 +855,9 @@ H5free_memory(void *mem) * NOTE: The main purpose of this is for handling Win32 thread cleanup * on thread/process detach. * + * Only enabled when the shared Windows library is built with + * thread safety enabled. + * * Return: TRUE on success, FALSE on failure * *------------------------------------------------------------------------- @@ -900,4 +904,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*/ |