merges r24408 and r24409 from trunk into ruby_1_9_1.

--
* ruby.c (rb_stdio_set_default_encoding): declared.
--
* io.c (rb_stdio_set_default_encoding): prototyped.

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

1 files changed, 1 insertions, 1 deletions

diff --git a/io.c b/io.c
index bf10a31d51..7f6ed3c705 100644
--- a/io.c
+++ b/io.c
@@ -7949,7 +7949,7 @@ rb_io_set_encoding(int argc, VALUE *argv, VALUE io)
 }
 
 void
-rb_stdio_set_default_encoding()
+rb_stdio_set_default_encoding(void)
 {
     extern VALUE rb_stdin, rb_stdout, rb_stderr;
     VALUE val = Qnil;