yugui	2009-08-09 00:34:48 +0900 (Sun, 09 Aug 2009)

  New Revision: 24471

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=24471

  Log:
    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.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/io.c
    branches/ruby_1_9_1/ruby.c
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 24470)
+++ ruby_1_9_1/ChangeLog	(revision 24471)
@@ -1,3 +1,7 @@
+Wed Aug  5 19:11:01 2009  NARUSE, Yui  <naruse@r...>
+
+	* ruby.c (rb_stdio_set_default_encoding): declared.
+
 Wed Aug  5 18:46:01 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* debug.c (ruby_dummy_gdb_enums): made public.  [ruby-dev:39001]
Index: ruby_1_9_1/io.c
===================================================================
--- ruby_1_9_1/io.c	(revision 24470)
+++ ruby_1_9_1/io.c	(revision 24471)
@@ -7949,7 +7949,7 @@
 }
 
 void
-rb_stdio_set_default_encoding()
+rb_stdio_set_default_encoding(void)
 {
     extern VALUE rb_stdin, rb_stdout, rb_stderr;
     VALUE val = Qnil;
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 24470)
+++ ruby_1_9_1/version.h	(revision 24471)
@@ -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
Index: ruby_1_9_1/ruby.c
===================================================================
--- ruby_1_9_1/ruby.c	(revision 24470)
+++ ruby_1_9_1/ruby.c	(revision 24471)
@@ -1188,6 +1188,8 @@
     return str;
 }
 
+void rb_stdio_set_default_encoding(void);
+
 static VALUE
 process_options(VALUE arg)
 {

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/