diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-09 15:02:03 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-09 15:02:03 +0000 |
| commit | 0d946b214b0ae7f6a38907a0fb3186451ea0db5d (patch) | |
| tree | 89197f4b02c72ff4a34c5401fcc6579be239054e /ext | |
| parent | 0c2b3f7f4f1628b340d2e08614db608f0e54f96e (diff) | |
merge revision(s) 39475: [Backport #7868]
* ext/date/date_core.c: [ruby-core:52303]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39676 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/date/date_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/date/date_core.c b/ext/date/date_core.c index 37d00d177e..f898c46aa2 100644 --- a/ext/date/date_core.c +++ b/ext/date/date_core.c @@ -7765,7 +7765,7 @@ datetime_s_now(int argc, VALUE *argv, VALUE klass) of = tm.tm_gmtoff; #elif defined(HAVE_VAR_TIMEZONE) #ifdef HAVE_VAR_ALTZONE - of = (long)((tm.tm_isdst > 0) ? altzone : timezone); + of = (long)-((tm.tm_isdst > 0) ? altzone : timezone); #else of = (long)-timezone; if (tm.tm_isdst) { |