From fe4c599e099b5302f6ac949077e130cd88ac5de8 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sat, 7 Jun 2008 21:05:06 +0000 Subject: merge revision(s) 14883: * time.c (time_arg): use converted object. [ruby-core:14759] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17010 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ time.c | 2 +- version.h | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ad1d97cc6c..289dcb419c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sun Jun 8 06:04:41 2008 Nobuyoshi Nakada + + * time.c (time_arg): use converted object. [ruby-core:14759] + Sun Jun 8 06:02:11 2008 Nobuyoshi Nakada * io.c (fptr_finalize): clear errno first. [ruby-talk:284492] diff --git a/time.c b/time.c index c749020737..00061f78ff 100644 --- a/time.c +++ b/time.c @@ -349,7 +349,7 @@ time_arg(argc, argv, tm, usec) tm->tm_mon = -1; for (i=0; i<12; i++) { if (RSTRING(s)->len == 3 && - strcasecmp(months[i], RSTRING(v[1])->ptr) == 0) { + strcasecmp(months[i], RSTRING(s)->ptr) == 0) { tm->tm_mon = i; break; } diff --git a/version.h b/version.h index 45ce1a13a3..8525779176 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-08" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20080608 -#define RUBY_PATCHLEVEL 164 +#define RUBY_PATCHLEVEL 165 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit v1.2.3