diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2018-12-17 23:34:44 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2018-12-17 23:34:44 (GMT) |
| commit | d8656bdbb22d231d69fd209e5503bca183a87b83 (patch) | |
| tree | 0d2462f0530d94bb59aa830026d2097152a2e011 | |
| parent | 8909646693c312be5d3f4a0d4fef4623833bcaf8 (diff) | |
| parent | a7618f432b671ad041ae63a83bf9b9bb08096dbe (diff) | |
| download | hdf5-d8656bdbb22d231d69fd209e5503bca183a87b83.zip hdf5-d8656bdbb22d231d69fd209e5503bca183a87b83.tar.gz hdf5-d8656bdbb22d231d69fd209e5503bca183a87b83.tar.bz2 | |
Merge pull request #1389 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:strtok_windows_fix to develop
* commit 'a7618f432b671ad041ae63a83bf9b9bb08096dbe':
Updated with extra sanity check and improved comment.
Fixed an issue in the passthru Windows va_copy hack.
| -rw-r--r-- | src/H5VLpassthru.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/H5VLpassthru.c b/src/H5VLpassthru.c index bf81425..49102d7 100644 --- a/src/H5VLpassthru.c +++ b/src/H5VLpassthru.c @@ -41,10 +41,12 @@ /* (Uncomment to enable) */ /* #define ENABLE_PASSTHRU_LOGGING */ -/* Windows missing va_copy() hack (from H5win2_defs.h) */ -#if (_MSC_VER < 1800) +/* Hack for missing va_copy() in old Visual Studio editions + * (from H5win2_defs.h - used on VS2012 and earlier) + */ +#if defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER < 1800) #define va_copy(D,S) ((D) = (S)) -#endif /* MSC_VER < 1800 */ +#endif /************/ /* Typedefs */ |