diff options
| author | sergey.brester <sergey.brester> | 2019-02-12 18:41:24 (GMT) |
|---|---|---|
| committer | sergey.brester <sergey.brester> | 2019-02-12 18:41:24 (GMT) |
| commit | 9a62e42dd654c613c75092b53a0d18e06a319692 (patch) | |
| tree | 76d8881fe627b15359a646751531f9a780133ea7 /win/tclWinTime.c | |
| parent | ccbd8395f4a51f5b769998058006ed3d36823ace (diff) | |
| parent | 1dec12d61848ab939bde91eb6e3a095222cf4236 (diff) | |
| download | tcl-9a62e42dd654c613c75092b53a0d18e06a319692.zip tcl-9a62e42dd654c613c75092b53a0d18e06a319692.tar.gz tcl-9a62e42dd654c613c75092b53a0d18e06a319692.tar.bz2 | |
merge 8.5 (note: to avoid too many conflicts, merged using `fossil merge --baseline 0055a16a8b core-8-5-branch`)
Diffstat (limited to 'win/tclWinTime.c')
| -rw-r--r-- | win/tclWinTime.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/win/tclWinTime.c b/win/tclWinTime.c index 93f62b8..0a638e8 100644 --- a/win/tclWinTime.c +++ b/win/tclWinTime.c @@ -847,6 +847,11 @@ TclpGetDate( time_t time; if (!useGMT) { +#if defined(_MSC_VER) && (_MSC_VER >= 1900) +# undef timezone /* prevent conflict with timezone() function */ + long timezone = 0; +#endif + tzset(); /* @@ -876,6 +881,10 @@ TclpGetDate( return TclpLocaltime(t); } +#if defined(_MSC_VER) && (_MSC_VER >= 1900) + _get_timezone(&timezone); +#endif + time = *t - timezone; /* |