diff options
| author | sergey.brester <sergey.brester> | 2019-02-07 15:45:42 (GMT) |
|---|---|---|
| committer | sergey.brester <sergey.brester> | 2019-02-07 15:45:42 (GMT) |
| commit | 0a876f8e0063525f271dbf8a958fd4c092f655b5 (patch) | |
| tree | 6396e2e88472fc9b9e0ce83583a1409ecedba739 /win/tclWinTime.c | |
| parent | f9abf9b060c15ad2d4b00f99f7814a388875c642 (diff) | |
| parent | 04ed7f99daa6ac1ca3e5a2903fc7c9325cd4d581 (diff) | |
| download | tcl-0a876f8e0063525f271dbf8a958fd4c092f655b5.zip tcl-0a876f8e0063525f271dbf8a958fd4c092f655b5.tar.gz tcl-0a876f8e0063525f271dbf8a958fd4c092f655b5.tar.bz2 | |
merge 8.6(.9), conflicts resolved
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 e1aff48..fd14595 100644 --- a/win/tclWinTime.c +++ b/win/tclWinTime.c @@ -724,6 +724,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(); /* @@ -753,6 +758,10 @@ TclpGetDate( return TclpLocaltime(t); } +#if defined(_MSC_VER) && (_MSC_VER >= 1900) + _get_timezone(&timezone); +#endif + time = *t - timezone; /* |