summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorVailin Choi <vchoi@hdfgroup.org>2014-11-12 17:35:38 (GMT)
committerVailin Choi <vchoi@hdfgroup.org>2014-11-12 17:35:38 (GMT)
commitca609fa9a662284aab15a19842ed93bd4d0a3fd0 (patch)
treef31cedcf5a974275752f5f5b145037af6f8b7c4d /src
parent3f839063e3e00fb428e82950388b91b094e6e2d0 (diff)
downloadhdf5-ca609fa9a662284aab15a19842ed93bd4d0a3fd0.zip
hdf5-ca609fa9a662284aab15a19842ed93bd4d0a3fd0.tar.gz
hdf5-ca609fa9a662284aab15a19842ed93bd4d0a3fd0.tar.bz2
[svn-r25809] Merge revisions #25274, #25282 from trunk to revise_chunks.
(Revision #25273 is skipped because it was backed out later on 11/3/2014.) h5committested.
Diffstat (limited to 'src')
-rw-r--r--src/H5.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/H5.c b/src/H5.c
index 9ece760..af8b668 100644
--- a/src/H5.c
+++ b/src/H5.c
@@ -842,7 +842,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
*
@@ -851,6 +852,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
*
*-------------------------------------------------------------------------
@@ -897,4 +901,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*/