diff options
author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-25 23:02:04 +0000 |
---|---|---|
committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-25 23:02:04 +0000 |
commit | 64bcecf7a74cb32c3d640a03b1e4d7a3310fa7db (patch) | |
tree | b0f4785de3b1f454287920f83e727075637e312f /marshal.c | |
parent | 62b018972c2be5e3bfc247e2ef01947533940293 (diff) |
Merge from ruby_1_8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@16597 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'marshal.c')
-rw-r--r-- | marshal.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 @@ -1364,7 +1364,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); } @@ -1502,6 +1501,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"); |