diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-02 08:06:46 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-02 08:06:46 +0000 |
| commit | 230b8b524da27baaee1ded6bfc8bdef842940400 (patch) | |
| tree | 5a1dfb3ad743ee6958bb43efc437ac0ed260a8fe /include | |
| parent | 55eecb54e79260379480dacb13272b10699ec5a8 (diff) | |
merges r29446 and r29448 from trunk into ruby_1_9_2.
--
* numeric.c (rb_enc_uint_chr): split from int_chr.
* numeric.c (int_chr): use rb_enc_uint_chr.
* include/ruby/encoding.h (rb_enc_uint_chr): added.
--
* io.c (rb_io_ungetc): use unsigned int for GB18030.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30038 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'include')
| -rw-r--r-- | include/ruby/encoding.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h index 88f5e52101..1573b5b200 100644 --- a/include/ruby/encoding.h +++ b/include/ruby/encoding.h @@ -98,6 +98,7 @@ long rb_enc_strlen(const char*, const char*, rb_encoding*); char* rb_enc_nth(const char*, const char*, long, rb_encoding*); VALUE rb_obj_encoding(VALUE); VALUE rb_enc_str_buf_cat(VALUE str, const char *ptr, long len, rb_encoding *enc); +VALUE rb_enc_uint_chr(unsigned int code, rb_encoding *enc); VALUE rb_external_str_new_with_enc(const char *ptr, long len, rb_encoding *); VALUE rb_str_export_to_enc(VALUE, rb_encoding *); |