archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 09:33:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merge revision(s) 28037:

Browse source 
* 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.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28042 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2010-05-27 14:52:53 +00:00
parent d760018fd9
commit f813ed043e
3 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
Thu May 27 23:52:43 2010 NARUSE, Yui <naruse@ruby-lang.org>
* 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@ruby-lang.org> Thu May 27 23:51:05 2010 NARUSE, Yui <naruse@ruby-lang.org>
* file.c (rb_home_dir): set filesystem encoding. * file.c (rb_home_dir): set filesystem encoding.

4
encoding.c
View file

@ -1114,7 +1114,7 @@ rb_usascii_encindex(void)
return ENCINDEX_US_ASCII; return ENCINDEX_US_ASCII;
} }
static int int
rb_locale_encindex(void) rb_locale_encindex(void)
{ {
VALUE charmap = rb_locale_charmap(rb_cEncoding); VALUE charmap = rb_locale_charmap(rb_cEncoding);
@ -1155,7 +1155,7 @@ enc_set_filesystem_encoding(void)
return idx; return idx;
} }
static int int
rb_filesystem_encindex(void) rb_filesystem_encindex(void)
{ {
int idx = rb_enc_registered("filesystem"); int idx = rb_enc_registered("filesystem");

2
include/ruby/encoding.h
View file

@ -195,6 +195,8 @@ rb_encoding *rb_default_internal_encoding(void);
int rb_ascii8bit_encindex(void); int rb_ascii8bit_encindex(void);
int rb_utf8_encindex(void); int rb_utf8_encindex(void);
int rb_usascii_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_external(void);
VALUE rb_enc_default_internal(void); VALUE rb_enc_default_internal(void);
void rb_enc_set_default_external(VALUE encoding); void rb_enc_set_default_external(VALUE encoding);