diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-07 21:04:24 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-07 21:04:24 +0000 |
commit | 072943af665411fe7b5d9c772cf669ad7ae8cc7e (patch) | |
tree | 9ca30602b923e7a275ef946a7731156f44a70938 | |
parent | f161d2b7a68aa42add7fc3e262a644fb739421b2 (diff) |
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_5@17008 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | time.c | 2 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 6 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Sun Jun 8 06:03:45 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * time.c (time_arg): use converted object. [ruby-core:14759] + Sun Jun 8 06:01:25 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * io.c (fptr_finalize): clear errno first. [ruby-talk:284492] @@ -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; } @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-08" #define RUBY_VERSION_CODE 185 #define RUBY_RELEASE_CODE 20080608 -#define RUBY_PATCHLEVEL 163 +#define RUBY_PATCHLEVEL 164 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |