From c2af2e737069c5a668d8475ad8be707c2eb66b99 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sun, 15 Jun 2008 14:20:59 +0000 Subject: [PATCH] merge revision(s) 16596: * marshal.c (r_object0, Init_marshal): Fix the garbled s_call definition; fixes [ruby-dev:34843]. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_5@17329 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ marshal.c | 4 ++-- version.h | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1fae50abcd..de005eb485 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Jun 15 23:20:37 2008 Akinori MUSHA + + * 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 * object.c (rb_cstr_to_dbl): should clear errno before calling diff --git a/marshal.c b/marshal.c index ae1bb6030b..83c3d0d5e6 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"); diff --git a/version.h b/version.h index c89650660b..f7dff57517 100644 --- a/version.h +++ b/version.h @@ -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