diff options
| -rw-r--r-- | src/H5.c | 8 | ||||
| -rw-r--r-- | testpar/CMakeLists.txt | 5 |
2 files changed, 6 insertions, 7 deletions
@@ -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*/ diff --git a/testpar/CMakeLists.txt b/testpar/CMakeLists.txt index 7f3fe7f..8c631a3 100644 --- a/testpar/CMakeLists.txt +++ b/testpar/CMakeLists.txt @@ -43,7 +43,6 @@ ENDMACRO (ADD_H5P_EXE file) set (H5P_TESTS t_mpi -# t_posix_compliant t_cache t_pflush1 t_pflush2 @@ -54,8 +53,4 @@ foreach (testp ${H5P_TESTS}) ADD_H5P_EXE(${testp}) endforeach (testp ${H5P_TESTS}) -if (NOT WIN32) - ADD_H5P_EXE(t_posix_compliant) -endif (NOT WIN32) - include (CMakeTests.cmake) |