diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2015-10-23 14:44:04 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2015-10-23 14:44:04 (GMT) |
| commit | 5c8703895db82fdc0af4e207bc012d46a5a6e77e (patch) | |
| tree | 4e22188d328c7d391c1306342bacb46402589ed9 /src/H5win32defs.h | |
| parent | 6ab00dd2a053ebd5e979f255654934c98e35770a (diff) | |
| download | hdf5-5c8703895db82fdc0af4e207bc012d46a5a6e77e.zip hdf5-5c8703895db82fdc0af4e207bc012d46a5a6e77e.tar.gz hdf5-5c8703895db82fdc0af4e207bc012d46a5a6e77e.tar.bz2 | |
[svn-r28202] HDFFV-9550: Add VS2015 fix for timezone.
CMake test fix for VS2015 print exponent
Diffstat (limited to 'src/H5win32defs.h')
| -rw-r--r-- | src/H5win32defs.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/H5win32defs.h b/src/H5win32defs.h index 185e9b4..58e1412 100644 --- a/src/H5win32defs.h +++ b/src/H5win32defs.h @@ -84,7 +84,13 @@ struct timezone { #define HDgetlogin() Wgetlogin() #define HDsnprintf c99_snprintf /*varargs*/ #define HDvsnprintf c99_vsnprintf - +#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. + #define HDget_timezone(V) _get_timezone(V); +#endif + #endif /* H5_HAVE_VISUAL_STUDIO */ /* Non-POSIX functions */ |