From 66f913572682f54eda3b0d4b78c5e9cef08043dd Mon Sep 17 00:00:00 2001 From: tadf Date: Sun, 24 Feb 2013 12:16:07 +0000 Subject: [PATCH] * ext/date/date_core.c: [ruby-core:52303] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39475 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ ext/date/date_core.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7da0d9377d..eec0c1bf35 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sun Feb 24 21:15:05 2013 Tadayoshi Funaba + + * ext/date/date_core.c: [ruby-core:52303] + Sun Feb 24 15:33:46 2013 Nobuyoshi Nakada * random.c (rb_random_ulong_limited): limit is inclusive, but generic 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) {