diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2015-10-22 20:01:32 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2015-10-22 20:01:32 (GMT) |
| commit | 543ec79118fa8f91fba4bff43d355d71c83b98f6 (patch) | |
| tree | 81393d6b9ce224edf2d342dfa08b91b6e583fcfa /src/H5win32defs.h | |
| parent | 779154925282f5240e792f9b2e5b242a91005abb (diff) | |
| download | hdf5-543ec79118fa8f91fba4bff43d355d71c83b98f6.zip hdf5-543ec79118fa8f91fba4bff43d355d71c83b98f6.tar.gz hdf5-543ec79118fa8f91fba4bff43d355d71c83b98f6.tar.bz2 | |
[svn-r28193] Rework VS2015 timezone patch for better fit to standards.
Tested: VS2015 VMs
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 */ |