diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-07 17:39:44 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-07 17:39:44 +0000 |
| commit | 86985f88d5f5bb9c162722e7f6ff3dab928b7771 (patch) | |
| tree | 2e18a3411a9cdd58c64185fd72b9d11485d6e332 /include/ruby | |
| parent | b8217317910881f8fe3056c4703be40bcf11fa44 (diff) | |
| download | ruby-86985f88d5f5bb9c162722e7f6ff3dab928b7771.tar.gz ruby-86985f88d5f5bb9c162722e7f6ff3dab928b7771.tar.xz ruby-86985f88d5f5bb9c162722e7f6ff3dab928b7771.zip | |
* encoding.c (rb_default_internal_encoding): merged a patch from
Michael Selig <michael.selig at fs.com.au> in [ruby-core:18985].
* io.c (rb_io_ext_int_to_encs): ditto.
* ruby.c (proc_options): support default internal encoding in -E
option.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19709 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'include/ruby')
| -rw-r--r-- | include/ruby/encoding.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h index 1d1293435..9049df3fa 100644 --- a/include/ruby/encoding.h +++ b/include/ruby/encoding.h @@ -168,11 +168,14 @@ rb_encoding *rb_usascii_encoding(void); rb_encoding *rb_locale_encoding(void); rb_encoding *rb_filesystem_encoding(void); rb_encoding *rb_default_external_encoding(void); +rb_encoding *rb_default_internal_encoding(void); int rb_ascii8bit_encindex(void); int rb_utf8_encindex(void); int rb_usascii_encindex(void); VALUE rb_enc_default_external(void); +VALUE rb_enc_default_internal(void); void rb_enc_set_default_external(VALUE encoding); +void rb_enc_set_default_internal(VALUE encoding); VALUE rb_locale_charmap(VALUE klass); long rb_memsearch(const void*,long,const void*,long,rb_encoding*); |