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_6@17331 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 2 insertions, 2 deletions

diff --git a/marshal.c b/marshal.c
index d714f65122..823bcad7e4 100644
--- a/marshal.c
+++ b/marshal.c
@@ -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");