summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2019-08-28 20:18:16 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2019-08-28 20:18:16 (GMT)
commit256629d7565971ea5231b4c14961a063b891b3af (patch)
tree01b6f0f3673f23c5a97b82a5c457bc5220632528 /config
parent70456e13139b8e5fbbfb06a64acc5db40dc5cdac (diff)
parentb5c2b64307dc01128d2a90771cf51076bc1252db (diff)
downloadhdf5-256629d7565971ea5231b4c14961a063b891b3af.zip
hdf5-256629d7565971ea5231b4c14961a063b891b3af.tar.gz
hdf5-256629d7565971ea5231b4c14961a063b891b3af.tar.bz2
Merge pull request #1909 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit 'b5c2b64307dc01128d2a90771cf51076bc1252db': Correct threadsafe enable code Mostly whitespace, HD prefix and remove obsolete #if blocks fix get gethostname for windows
Diffstat (limited to 'config')
-rw-r--r--config/cmake/H5pubconf.h.in7
1 files changed, 6 insertions, 1 deletions
diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in
index 05b0fff..9ccfae4 100644
--- a/config/cmake/H5pubconf.h.in
+++ b/config/cmake/H5pubconf.h.in
@@ -390,8 +390,13 @@
/* Define to 1 if you have the <szlib.h> header file. */
#cmakedefine H5_HAVE_SZLIB_H @H5_HAVE_SZLIB_H@
+#if defined(_WIN32) && !defined(H5_BUILT_AS_DYNAMIC_LIB)
+/* Not supported on WIN32 platforms with static linking */
+/* #undef H5_HAVE_THREADSAFE */
+#else
/* Define if we have thread safe support */
-#cmakedefine H5_HAVE_THREADSAFE @H5_HAVE_THREADSAFE@
+# cmakedefine H5_HAVE_THREADSAFE @H5_HAVE_THREADSAFE@
+#endif
/* Define if timezone is a global variable */
#cmakedefine H5_HAVE_TIMEZONE @H5_HAVE_TIMEZONE@