knu	2008-05-26 08:02:04 +0900 (Mon, 26 May 2008)

  New Revision: 16597

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/marshal.c

  Log:
    Merge from ruby_1_8.

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/marshal.c?r1=16597&r2=16596&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/ChangeLog?r1=16597&r2=16596&diff_format=u

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 16596)
+++ ruby_1_8_7/ChangeLog	(revision 16597)
@@ -1,3 +1,8 @@
+Mon May 26 08:00:52 2008  Akinori MUSHA  <knu@i...>
+
+	* marshal.c (r_object0, Init_marshal): Fix the garbled s_call
+	  definition; fixes [ruby-dev:34843].
+
 Mon May 26 03:16:20 2008  Akinori MUSHA  <knu@i...>
 
 	* hash.c (rb_hash_default): Fix rdoc.
Index: ruby_1_8_7/marshal.c
===================================================================
--- ruby_1_8_7/marshal.c	(revision 16596)
+++ ruby_1_8_7/marshal.c	(revision 16597)
@@ -81,7 +81,7 @@
 #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 @@
 	break;
     }
     if (proc) {
-	ID s_call = 
 	rb_funcall(proc, s_call, 1, v);
 	reentrant_check(arg->data, s_call);
     }
@@ -1502,6 +1501,7 @@
     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");

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/