shyouhei	2008-06-15 23:20:59 +0900 (Sun, 15 Jun 2008)

  New Revision: 17329

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/marshal.c
    branches/ruby_1_8_5/version.h

  Log:
    merge revision(s) 16596:
    * marshal.c (r_object0, Init_marshal): Fix the garbled s_call
      definition; fixes [ruby-dev:34843].


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/marshal.c?r1=17329&r2=17328&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=17329&r2=17328&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=17329&r2=17328&diff_format=u

Index: ruby_1_8_5/ChangeLog
===================================================================
--- ruby_1_8_5/ChangeLog	(revision 17328)
+++ ruby_1_8_5/ChangeLog	(revision 17329)
@@ -1,3 +1,8 @@
+Sun Jun 15 23:20:37 2008  Akinori MUSHA  <knu@i...>
+
+	* 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@r...>
 
 	* object.c (rb_cstr_to_dbl): should clear errno before calling
Index: ruby_1_8_5/version.h
===================================================================
--- ruby_1_8_5/version.h	(revision 17328)
+++ ruby_1_8_5/version.h	(revision 17329)
@@ -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
Index: ruby_1_8_5/marshal.c
===================================================================
--- ruby_1_8_5/marshal.c	(revision 17328)
+++ ruby_1_8_5/marshal.c	(revision 17329)
@@ -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
@@ -1367,7 +1367,6 @@
 	break;
     }
     if (proc) {
-	ID s_call = 
 	rb_funcall(proc, s_call, 1, v);
 	reentrant_check(arg->data, s_call);
     }
@@ -1505,6 +1504,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/