summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortadf <tadf@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-02-24 12:16:07 +0000
committertadf <tadf@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-02-24 12:16:07 +0000
commit66f913572682f54eda3b0d4b78c5e9cef08043dd (patch)
tree4dc7ffe6126f53d56731e3e46040d5baaa05530e
parent9e0683523ac1a995b9c30c94115d2cb66f2d76bb (diff)
* 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
-rw-r--r--ChangeLog4
-rw-r--r--ext/date/date_core.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7da0d93..eec0c1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Feb 24 21:15:05 2013 Tadayoshi Funaba <tadf@dotrb.org>
+
+ * ext/date/date_core.c: [ruby-core:52303]
+
Sun Feb 24 15:33:46 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* 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 37d00d1..f898c46 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) {