diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2015-10-21 21:22:06 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2015-10-21 21:22:06 (GMT) |
| commit | aa4284b2a3ce1908f339bd07da0370c493d71b89 (patch) | |
| tree | 549fe1380b90105d4b3bcdffbed88d30a62c443a | |
| parent | 9f702766f84887c04cfcaf0a41f748636ff1062d (diff) | |
| download | hdf5-aa4284b2a3ce1908f339bd07da0370c493d71b89.zip hdf5-aa4284b2a3ce1908f339bd07da0370c493d71b89.tar.gz hdf5-aa4284b2a3ce1908f339bd07da0370c493d71b89.tar.bz2 | |
[svn-r28174] HDFFV-9550: Add VS2015 fix for timezone.
| -rw-r--r-- | config/cmake_ext_mod/ConfigureChecks.cmake | 4 | ||||
| -rw-r--r-- | src/H5Omtime.c | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/config/cmake_ext_mod/ConfigureChecks.cmake b/config/cmake_ext_mod/ConfigureChecks.cmake index 94e5be1..d41923e 100644 --- a/config/cmake_ext_mod/ConfigureChecks.cmake +++ b/config/cmake_ext_mod/ConfigureChecks.cmake @@ -90,9 +90,7 @@ if (WINDOWS) endif (NOT UNIX AND NOT CYGWIN AND NOT MINGW) set (${HDF_PREFIX}_HAVE_FUNCTION 1) set (${HDF_PREFIX}_GETTIMEOFDAY_GIVES_TZ 1) - if (MSVC_VERSION LESS 1900) - set (${HDF_PREFIX}_HAVE_TIMEZONE 1) - endif (MSVC_VERSION LESS 1900) + set (${HDF_PREFIX}_HAVE_TIMEZONE 1) set (${HDF_PREFIX}_HAVE_GETTIMEOFDAY 1) if (MINGW) set (${HDF_PREFIX}_HAVE_WINSOCK2_H 1) diff --git a/src/H5Omtime.c b/src/H5Omtime.c index 622d57d..cac5aca 100644 --- a/src/H5Omtime.c +++ b/src/H5Omtime.c @@ -226,6 +226,13 @@ H5O_mtime_decode(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5 /* BSD-like systems */ the_time += tm.tm_gmtoff; #elif defined(H5_HAVE_TIMEZONE) + #if _MSC_VER >= 1900 // VS 2015 + // In gcc and in Visual Studio prior to VS 2015 'timezone' is a global + // variable declared in time.h. That variable was deprecated and in VS 2015 + // is removed, with _get_timezone replacing it. + long timezone = 0; + _get_timezone(&timezone); + #endif /* GNU/Linux systems */ the_time -= timezone - (tm.tm_isdst ? 3600 : 0); #else |