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

4
encoding.c
View file

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