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

1 files changed, 2 insertions, 2 deletions

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;
 }