diff options
author | max99x <max99x@gmail.com> | 2011-07-06 16:36:35 +0300 |
---|---|---|
committer | max99x <max99x@gmail.com> | 2011-07-06 16:36:35 +0300 |
commit | 13ac46b2c9be4aa17319c450a15ed96b71e091d7 (patch) | |
tree | de4790c121d125d3cf64093d48f0d93bffe840f3 /src | |
parent | 6390aaff2001afd7cdabd84cdaa141a4fba96b4d (diff) |
Fixed time.h timezone bug.
Diffstat (limited to 'src')
-rw-r--r-- | src/library.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/library.js b/src/library.js index b837778c..d6c727b9 100644 --- a/src/library.js +++ b/src/library.js @@ -1792,7 +1792,7 @@ var Library = { var offset = {{{ makeGetValue('_timezone', 0, 'i32') }}}; var daylight = {{{ makeGetValue('_daylight', 0, 'i32') }}}; daylight = (daylight == 1) ? 60 * 60 : 0; - var ret = _mktime(tmPtr) - (offset + daylight); + var ret = _mktime(tmPtr) + offset - daylight; return ret; }, @@ -1817,7 +1817,7 @@ var Library = { var start = new Date(date.getFullYear(), 0, 1); var yday = Math.floor((date.getTime() - start.getTime()) / (1000 * 60 * 60 * 24)); {{{ makeSetValue('tmPtr', '___tm_struct_layout.tm_yday', 'yday', 'i32') }}} - {{{ makeSetValue('tmPtr', '___tm_struct_layout.tm_gmtoff', '-start.getTimezoneOffset() * 60', 'i32') }}} + {{{ makeSetValue('tmPtr', '___tm_struct_layout.tm_gmtoff', 'start.getTimezoneOffset() * 60', 'i32') }}} var dst = Number(start.getTimezoneOffset() != date.getTimezoneOffset()); {{{ makeSetValue('tmPtr', '___tm_struct_layout.tm_isdst', 'dst', 'i32') }}} @@ -1876,7 +1876,7 @@ var Library = { if (_tzname !== null) return; _timezone = _malloc(QUANTUM_SIZE); - {{{ makeSetValue('_timezone', '0', '(new Date()).getTimezoneOffset() * 60', 'i32') }}} + {{{ makeSetValue('_timezone', '0', '-(new Date()).getTimezoneOffset() * 60', 'i32') }}} _daylight = _malloc(QUANTUM_SIZE); var winter = new Date(2000, 0, 1); |