jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5188 from trustable-code/patch-2

Browse source 
fixes #4804
This commit is contained in:
Andreas Rumpf 2017-01-07 00:27:53 +01:00 • committed by GitHub
commit edf2a57a70
1 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/pure/times.nim
View file

@ -523,16 +523,10 @@ when not defined(JS):
var cTimeInfo = timeInfo # for C++ we have to make a copy var cTimeInfo = timeInfo # for C++ we have to make a copy
# because the header of mktime is broken in my version of libc # because the header of mktime is broken in my version of libc
when defined(windows):
# On Windows `mktime` is broken enough to make this work.
result = mktime(timeInfoToTM(cTimeInfo)) result = mktime(timeInfoToTM(cTimeInfo))
# mktime is defined to interpret the input as local time. As timeInfoToTM # mktime is defined to interpret the input as local time. As timeInfoToTM
# does ignore the timezone, we need to adjust this here. # does ignore the timezone, we need to adjust this here.
result = Time(TimeImpl(result) - getTimezone() + timeInfo.timezone) result = Time(TimeImpl(result) - getTimezone() + timeInfo.timezone)
else:
result = timegm(timeInfoToTM(cTimeInfo))
# As timeInfoToTM does ignore the timezone, we need to adjust this here.
result = Time(TimeImpl(result) + timeInfo.timezone)
proc timeInfoToTime(timeInfo: TimeInfo): Time = toTime(timeInfo) proc timeInfoToTime(timeInfo: TimeInfo): Time = toTime(timeInfo)