From 2451d735a79d7c5f4bdb019335b7083bd081df69 Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 27 Nov 2010 09:08:29 +0000 Subject: * time.c (leap_year_v_p): fixed typo. [ruby-dev:42631] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29951 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ test/ruby/test_time.rb | 4 ++++ time.c | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9402cc88f5..e245875b10 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sat Nov 27 18:08:18 2010 Nobuyoshi Nakada + + * time.c (leap_year_v_p): fixed typo. [ruby-dev:42631] + Sat Nov 27 17:57:08 2010 Tanaka Akira * resolv.rb (Resolv::DNS): use the same DNS server when retry using diff --git a/test/ruby/test_time.rb b/test/ruby/test_time.rb index 83f5907f99..8c96a0d2cd 100644 --- a/test/ruby/test_time.rb +++ b/test/ruby/test_time.rb @@ -19,6 +19,10 @@ class TestTime < Test::Unit::TestCase assert_equal(Time.utc(2000,2,10), Time.new(2000,2,9, 13,0,0, -3600*11)) assert_equal(Time.utc(2000,2,10), Time.new(2000,2,10, 11,0,0, "+11:00")) assert_equal(Rational(1,2), Time.new(2000,2,10, 11,0,5.5, "+11:00").subsec) + bug4090 = '[ruby-dev:42631]' + tm = [2001,2,28,23,59,30] + t = Time.new(*tm, "-12:00") + assert_equal([2001,2,28,23,59,30,-43200], [t.year, t.month, t.mday, t.hour, t.min, t.sec, t.gmt_offset], bug4090) end def test_time_add() diff --git a/time.c b/time.c index 5ed11c6cee..ad08ff4296 100644 --- a/time.c +++ b/time.c @@ -853,7 +853,7 @@ static const char *find_time_t(struct tm *tptr, int utc_p, time_t *tp); static struct vtm *localtimew(wideval_t timew, struct vtm *result); static int leap_year_p(long y); -#define leap_year_v_p(y) leap_year_p(NUM2LONG(mod(v, INT2FIX(400)))) +#define leap_year_v_p(y) leap_year_p(NUM2LONG(mod((y), INT2FIX(400)))) #ifdef HAVE_GMTIME_R #define rb_gmtime_r(t, tm) gmtime_r(t, tm) -- cgit v1.2.3