summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2020-01-30 20:11:36 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2020-01-30 20:11:36 (GMT)
commit0e56affc7e484ef1a8c306aeec7be8049af13f80 (patch)
tree059b06f8bdcb6d3b077f7c815696116611c37149
parentd1f2eff23148da5e39463bd351be51767755b1c1 (diff)
parent099e68140101a6a2cd128f68d5f6b76661a1de92 (diff)
downloadhdf5-0e56affc7e484ef1a8c306aeec7be8049af13f80.zip
hdf5-0e56affc7e484ef1a8c306aeec7be8049af13f80.tar.gz
hdf5-0e56affc7e484ef1a8c306aeec7be8049af13f80.tar.bz2
Merge pull request #2330 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '099e68140101a6a2cd128f68d5f6b76661a1de92': VS2010 needs an underscore
-rw-r--r--src/H5win32defs.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/H5win32defs.h b/src/H5win32defs.h
index 29533dd..0a0bd37 100644
--- a/src/H5win32defs.h
+++ b/src/H5win32defs.h
@@ -40,6 +40,12 @@ typedef __int64 h5_stat_size_t;
#define HDfileno(F) _fileno(F)
#define HDfstat(F,B) _fstati64(F,B)
#define HDisatty(F) _isatty(F)
+
+/* The isnan function needs underscore in VS2012 and earlier */
+#if (_MSC_VER <= 1700)
+ #define HDisnan(X) _isnan(X)
+#endif /* MSC_VER < 1700 */
+
#define HDgetcwd(S,Z) _getcwd(S,Z)
#define HDgetdcwd(D,S,Z) _getdcwd(D,S,Z)
#define HDgetdrive() _getdrive()