diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 14:20:59 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 14:20:59 +0000 |
commit | dc2d035f67ce73ce0e09314875674465e62c367e (patch) | |
tree | 0a54a207f69b88471cac213615292f11b3b217fd | |
parent | d36cceded90ea5483ffdd68aaf5461dcfbd53c86 (diff) |
merge revision(s) 16596:
* marshal.c (r_object0, Init_marshal): Fix the garbled s_call
definition; fixes [ruby-dev:34843].
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@17329 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | marshal.c | 4 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Sun Jun 15 23:20:37 2008 Akinori MUSHA <knu@iDaemons.org> + + * marshal.c (r_object0, Init_marshal): Fix the garbled s_call + definition; fixes [ruby-dev:34843]. + Sun Jun 15 23:19:14 2008 Yukihiro Matsumoto <matz@ruby-lang.org> * object.c (rb_cstr_to_dbl): should clear errno before calling @@ -81,7 +81,7 @@ shortlen(len, ds) #define TYPE_LINK '@' static ID s_dump, s_load, s_mdump, s_mload; -static ID s_dump_data, s_load_data, s_alloc; +static ID s_dump_data, s_load_data, s_alloc, s_call; static ID s_getc, s_read, s_write, s_binmode; static void @@ -1367,7 +1367,6 @@ r_object0(arg, proc, ivp, extmod) break; } if (proc) { - ID s_call = rb_funcall(proc, s_call, 1, v); reentrant_check(arg->data, s_call); } @@ -1505,6 +1504,7 @@ Init_marshal() s_dump_data = rb_intern("_dump_data"); s_load_data = rb_intern("_load_data"); s_alloc = rb_intern("_alloc"); + s_call = rb_intern("call"); s_getc = rb_intern("getc"); s_read = rb_intern("read"); s_write = rb_intern("write"); @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-15" #define RUBY_VERSION_CODE 185 #define RUBY_RELEASE_CODE 20080615 -#define RUBY_PATCHLEVEL 215 +#define RUBY_PATCHLEVEL 216 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |