diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-19 09:02:43 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-19 09:02:43 +0000 |
commit | 619450c2d76fbd745268a2afb8c5102d73545f2a (patch) | |
tree | 42aadff091ea2159519af49b4de60956640cde2c | |
parent | 8d81fc6df66ab4d839ceaf94f274da36b7fab295 (diff) | |
download | ruby-619450c2d76fbd745268a2afb8c5102d73545f2a.tar.gz |
merge revision(s) 20581:
* pack.c (pack_pack): fixed odd act of 'm*', 'M*', and 'P*'.
just ignores '*' in these cases.
[ruby-dev:37289]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@22450 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | pack.c | 4 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 10 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Thu Feb 19 18:02:10 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp> + + * pack.c (pack_pack): fixed odd act of 'm*', 'M*', and 'P*'. + just ignores '*' in these cases. + [ruby-dev:37289] + Thu Feb 19 17:26:11 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * pack.c (pack_pack): fixed length for odd length string. @@ -494,7 +494,9 @@ pack_pack(ary, fmt) } } if (*p == '*') { /* set data length */ - len = strchr("@Xxu", type) ? 0 : items; + len = strchr("@Xxu", type) ? 0 + : strchr("PMm", type) ? 1 + : items; p++; } else if (ISDIGIT(*p)) { @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2009-02-19" #define RUBY_VERSION_CODE 187 #define RUBY_RELEASE_CODE 20090219 -#define RUBY_PATCHLEVEL 129 +#define RUBY_PATCHLEVEL 130 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |