diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2020-01-31 16:53:42 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2020-01-31 16:53:42 (GMT) |
commit | 561a0c8ff556f7b3cee58eb867ae1aa74edc61a2 (patch) | |
tree | 09962b6cda505cca3c6bbd440fc728a9affd4c96 /src | |
parent | cd8ca92f58dfb14b60757404eb0b67dfb383e7e3 (diff) | |
parent | a29f9e8451ffa391c8395db1142bd003f40f3aaa (diff) | |
download | hdf5-561a0c8ff556f7b3cee58eb867ae1aa74edc61a2.zip hdf5-561a0c8ff556f7b3cee58eb867ae1aa74edc61a2.tar.gz hdf5-561a0c8ff556f7b3cee58eb867ae1aa74edc61a2.tar.bz2 |
Merge pull request #2331 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_12 to hdf5_1_12
* commit 'a29f9e8451ffa391c8395db1142bd003f40f3aaa':
Merge changes from develop to fix various issues
Remove commented flags
Revert accidental change
Chnage tools debug macros to not use the error stack
Create common warnings for build systems
Diffstat (limited to 'src')
-rw-r--r-- | src/H5private.h | 3 | ||||
-rw-r--r-- | src/H5win32defs.h | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/H5private.h b/src/H5private.h index 74fab79..7ff0c87 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -1032,6 +1032,9 @@ typedef off_t h5_stat_size_t; #ifndef HDislower #define HDislower(C) islower((int)(C)) /*cast for solaris warning*/ #endif /* HDislower */ +#ifndef HDisnan + #define HDisnan(X) isnan(X) +#endif /* HDisnan */ #ifndef HDisprint #define HDisprint(C) isprint((int)(C)) /*cast for solaris warning*/ #endif /* HDisprint */ 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() |