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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@24471 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 8 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 37583df1e..c3d1d2170 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Aug  5 19:11:01 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ruby.c (rb_stdio_set_default_encoding): declared.
+
 Wed Aug  5 18:46:01 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* debug.c (ruby_dummy_gdb_enums): made public.  [ruby-dev:39001]
diff --git a/io.c b/io.c
index bf10a31d5..7f6ed3c70 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;
diff --git a/ruby.c b/ruby.c
index 68d8f97a4..b50ee4507 100644
--- a/ruby.c
+++ b/ruby.c
@@ -1188,6 +1188,8 @@ rb_f_chomp(argc, argv)
     return str;
 }
 
+void rb_stdio_set_default_encoding(void);
+
 static VALUE
 process_options(VALUE arg)
 {
diff --git a/version.h b/version.h
index 189db7803..d6718b4e2 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 275
+#define RUBY_PATCHLEVEL 276
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1