4 files changed, 17 insertions, 18 deletions
diff --git a/ChangeLog b/ChangeLog
index 02feb61366..ff16faf31f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sun Jun  3 16:33:58 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c: revert r35879 "now marshal_{load|dump} are external."
+
+	* complex.c (nucomp_marshal__{dump,load}): should use rb_marshal_{dump,load}.
+
+	* rational.c (nurat_marshal__{dump,load}): ditto.
+
 Sun Jun  3 14:13:58 2012  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* ext/date/date_core.c: checks whether the object is frozen or not.
diff --git a/complex.c b/complex.c
index 3b644b2319..c5303c10d9 100644
--- a/complex.c
+++ b/complex.c
@@ -1255,15 +1255,13 @@ nucomp_marshal_dump(VALUE self)
 }
 
 #ifdef MARSHAL_OLD_STYLE
-VALUE marshal_dump(int, VALUE *);
-
 /* :nodoc: */
 static VALUE
 nucomp_marshal__dump(VALUE self, VALUE limit)
 {
-    VALUE argv[1];
-    argv[0] = nucomp_marshal_dump(self);
-    return marshal_dump(1, argv);
+    VALUE arg;
+    arg = nucomp_marshal_dump(self);
+    return rb_marshal_dump(arg, Qnil);
 }
 #endif
 
@@ -1286,13 +1284,11 @@ nucomp_marshal_load(VALUE self, VALUE a)
 }
 
 #ifdef MARSHAL_OLD_STYLE
-VALUE marshal_load(int, VALUE *);
-
 /* :nodoc: */
 static VALUE
 nucomp_marshal__load(VALUE klass, VALUE s)
 {
-    return nucomp_marshal_load(nucomp_s_alloc(klass), marshal_load(1, &s));
+    return nucomp_marshal_load(nucomp_s_alloc(klass), rb_marshal_load(s));
 }
 #endif
 
diff --git a/marshal.c b/marshal.c
index 7745cb9ccd..046729d364 100644
--- a/marshal.c
+++ b/marshal.c
@@ -899,7 +899,7 @@ clear_dump_arg(struct dump_arg *arg)
  *   ThreadGroup, Continuation
  * * objects which defines singleton methods
  */
-VALUE
+static VALUE
 marshal_dump(int argc, VALUE *argv)
 {
     VALUE obj, port, a1, a2;
@@ -1752,7 +1752,7 @@ clear_load_arg(struct load_arg *arg)
  * to_str. If proc is specified, it will be passed each object as it
  * is deserialized.
  */
-VALUE
+static VALUE
 marshal_load(int argc, VALUE *argv)
 {
     VALUE port, proc;
diff --git a/rational.c b/rational.c
index 258f901d39..248fcdada0 100644
--- a/rational.c
+++ b/rational.c
@@ -1601,15 +1601,12 @@ nurat_marshal_dump(VALUE self)
 }
 
 #ifdef MARSHAL_OLD_STYLE
-VALUE marshal_dump(int, VALUE *);
-
 /* :nodoc: */
 static VALUE
 nurat_marshal__dump(VALUE self, VALUE limit)
 {
-    VALUE argv[1];
-    argv[0] = nurat_marshal_dump(self);
-    return marshal_dump(1, argv);
+    VALUE arg = nurat_marshal_dump(self);
+    return rb_marshal_dump(arg, Qnil);
 }
 #endif
 
@@ -1636,13 +1633,11 @@ nurat_marshal_load(VALUE self, VALUE a)
 }
 
 #ifdef MARSHAL_OLD_STYLE
-VALUE marshal_load(int, VALUE *);
-
 /* :nodoc: */
 static VALUE
 nurat_marshal__load(VALUE klass, VALUE s)
 {
-    return nurat_marshal_load(nurat_s_alloc(klass), marshal_load(1, &s));
+    return nurat_marshal_load(nurat_s_alloc(klass), rb_marshal_load(s));
 }
 #endif