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 | |
| 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
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | encoding.c | 4 | ||||
| -rw-r--r-- | include/ruby/encoding.h | 2 |
3 files changed, 14 insertions, 2 deletions
@@ -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> * file.c (rb_home_dir): set filesystem encoding. 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"); diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h index 36f4a7cf12..88f5e52101 100644 --- a/include/ruby/encoding.h +++ b/include/ruby/encoding.h @@ -195,6 +195,8 @@ rb_encoding *rb_default_internal_encoding(void); 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); |