From 09992441540837dc7068bd45f26eb73080386f94 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sat, 17 Jan 2009 03:11:47 +0000 Subject: merge revision(s) 16602: * marshal.c (dump_ensure, load_ensure): should return values. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@21613 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ marshal.c | 4 ++-- version.h | 8 ++++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3a5ab44e3a..6535cbe54e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sat Jan 17 12:11:06 2009 NAKAMURA Usaku + + * marshal.c (dump_ensure, load_ensure): should return values. + Fri Jan 16 10:55:51 2009 Yukihiro Matsumoto * class.c (clone_method): should copy cbase in cref as well. diff --git a/marshal.c b/marshal.c index be5326e0a2..cea1d3154c 100644 --- a/marshal.c +++ b/marshal.c @@ -703,7 +703,7 @@ static VALUE dump_ensure(arg) struct dump_arg *arg; { - if (RBASIC(arg->str)->klass) return; /* ignore reentrant */ + if (RBASIC(arg->str)->klass) return 0; /* ignore reentrant */ st_free_table(arg->symbols); st_free_table(arg->data); if (arg->taint) { @@ -1391,7 +1391,7 @@ static VALUE load_ensure(arg) struct load_arg *arg; { - if (RBASIC(arg->data)->klass) return; /* ignore reentrant */ + if (RBASIC(arg->data)->klass) return 0; /* ignore reentrant */ st_free_table(arg->symbols); return 0; } diff --git a/version.h b/version.h index abf74f6319..acae4e6d76 100644 --- a/version.h +++ b/version.h @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2009-01-16" +#define RUBY_RELEASE_DATE "2009-01-17" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20090116 -#define RUBY_PATCHLEVEL 300 +#define RUBY_RELEASE_CODE 20090117 +#define RUBY_PATCHLEVEL 301 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 6 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 16 +#define RUBY_RELEASE_DAY 17 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; -- cgit v1.2.3