* ruby.h (rb_block_call_func): Fix prototype.

* enumerator.c (enumerator_iter_i, enumerator_each_i): Ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@16005 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 11 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index d38a88ba77..5b1a7536ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Apr 14 16:42:53 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ruby.h (rb_block_call_func): Fix prototype.
+
+	* enumerator.c (enumerator_iter_i, enumerator_each_i): Ditto.
+
 Mon Apr 14 15:49:05 2008  Akinori MUSHA  <knu@iDaemons.org>
 
 	* enum.c (enum_count, enum_find_index): New methods:
diff --git a/enumerator.c b/enumerator.c
index 826dacc249..c27ab1688b 100644
--- a/enumerator.c
+++ b/enumerator.c
@@ -72,13 +72,11 @@ enumerator_ptr(obj)
     return ptr;
 }
 
-static VALUE enumerator_iter_i _((VALUE, VALUE, int, VALUE *));
+static VALUE enumerator_iter_i _((VALUE, VALUE));
 static VALUE
-enumerator_iter_i(i, enum_obj, argc, argv)
+enumerator_iter_i(i, enum_obj)
     VALUE i;
     VALUE enum_obj;
-    int argc;
-    VALUE *argv;
 {
     struct enumerator *e = (struct enumerator *)enum_obj;
     return rb_yield(proc_call(e->proc, i));
@@ -238,13 +236,11 @@ enumerator_allocate(klass)
 			    enumerator_mark, -1, ptr);
 }
 
-static VALUE enumerator_each_i _((VALUE, VALUE, int, VALUE *));
+static VALUE enumerator_each_i _((VALUE, VALUE));
 static VALUE
-enumerator_each_i(v, enum_obj, argc, argv)
+enumerator_each_i(v, enum_obj)
     VALUE v;
     VALUE enum_obj;
-    int argc;
-    VALUE *argv;
 {
     return rb_yield(v);
 }
diff --git a/ruby.h b/ruby.h
index 95b4c4ca78..abf9e11085 100644
--- a/ruby.h
+++ b/ruby.h
@@ -574,7 +574,7 @@ void rb_warning __((const char*, ...));		/* reports if `-w' specified */
 void rb_sys_warning __((const char*, ...));	/* reports if `-w' specified */
 void rb_warn __((const char*, ...));		/* reports always */
 
-typedef VALUE rb_block_call_func _((VALUE, VALUE, int, VALUE*));
+typedef VALUE rb_block_call_func _((VALUE, VALUE));
 
 VALUE rb_each _((VALUE));
 VALUE rb_yield _((VALUE));