diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-11 02:19:39 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-11 02:19:39 +0000 |
| commit | 116843c6f00e3a5dca5437b6b9364d4466fdb542 (patch) | |
| tree | 523e5b18ff631c2f6ad1185baf75550922e8345a /ext | |
| parent | d5279a5158111a8fcb621021a35f37328399b07a (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_1_9_3@40227 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 c22a9d496c..4048d1345d 100644 --- a/ext/date/date_core.c +++ b/ext/date/date_core.c @@ -7864,7 +7864,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) { |