naruse	2010-05-27 23:52:53 +0900 (Thu, 27 May 2010)

  New Revision: 28042

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

  Log:
    merge revision(s) 28037:
    * include/ruby/encoding.h (rb_filesystem_encindex): defined.
    * include/ruby/encoding.h (rb_locale_encindex): ditto.
    * encoding.c (rb_filesystem_encindex): remove static.
    * encoding.c (rb_locale_encindex): ditto.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/encoding.c
    branches/ruby_1_9_2/include/ruby/encoding.h

Index: ruby_1_9_2/encoding.c
===================================================================
--- ruby_1_9_2/encoding.c	(revision 28041)
+++ ruby_1_9_2/encoding.c	(revision 28042)
@@ -1114,7 +1114,7 @@
     return ENCINDEX_US_ASCII;
 }
 
-static int
+int
 rb_locale_encindex(void)
 {
     VALUE charmap = rb_locale_charmap(rb_cEncoding);
@@ -1155,7 +1155,7 @@
     return idx;
 }
 
-static int
+int
 rb_filesystem_encindex(void)
 {
     int idx = rb_enc_registered("filesystem");
Index: ruby_1_9_2/include/ruby/encoding.h
===================================================================
--- ruby_1_9_2/include/ruby/encoding.h	(revision 28041)
+++ ruby_1_9_2/include/ruby/encoding.h	(revision 28042)
@@ -195,6 +195,8 @@
 int rb_ascii8bit_encindex(void);
 int rb_utf8_encindex(void);
 int rb_usascii_encindex(void);
+int rb_locale_encindex(void);
+int rb_filesystem_encindex(void);
 VALUE rb_enc_default_external(void);
 VALUE rb_enc_default_internal(void);
 void rb_enc_set_default_external(VALUE encoding);
Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 28041)
+++ ruby_1_9_2/ChangeLog	(revision 28042)
@@ -1,3 +1,13 @@
+Thu May 27 23:52:43 2010  NARUSE, Yui  <naruse@r...>
+
+	* include/ruby/encoding.h (rb_filesystem_encindex): defined.
+
+	* include/ruby/encoding.h (rb_locale_encindex): ditto.
+
+	* encoding.c (rb_filesystem_encindex): remove static.
+
+	* encoding.c (rb_locale_encindex): ditto.
+
 Thu May 27 23:51:05 2010  NARUSE, Yui  <naruse@r...>
 
 	* file.c (rb_home_dir): set filesystem encoding.

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