diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-27 14:52:53 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-27 14:52:53 +0000 |
commit | f813ed043e9b7fe80ccb9e39c482f5974ea61e60 (patch) | |
tree | 5b34efa867e44df5787fbd4517243f6167259e6b /encoding.c | |
parent | d760018fd972d4fe553c93e324a70d4ad7a0af16 (diff) |
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.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28042 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'encoding.c')
-rw-r--r-- | encoding.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/encoding.c b/encoding.c index b1aceffa18..001762221f 100644 --- a/encoding.c +++ b/encoding.c @@ -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"); |