summaryrefslogtreecommitdiffstats
path: root/include/ruby
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-21 09:18:34 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-21 09:18:34 +0000
commitc814ec80c7d06c14f4b38f6c537ef186a92d73e3 (patch)
tree190b49f514b59163a44d62dccdaec4f0cc89176b /include/ruby
parent02ab62312b0f0e5104db4279d1baeef1ac5fe602 (diff)
downloadruby-c814ec80c7d06c14f4b38f6c537ef186a92d73e3.tar.gz
ruby-c814ec80c7d06c14f4b38f6c537ef186a92d73e3.tar.xz
ruby-c814ec80c7d06c14f4b38f6c537ef186a92d73e3.zip
* ext/zlib/zlib.c: remove obsolete prototype macros.
* ext/zlib/zlib.c (struct gzfile): add encoding field to gzfile structure. * ext/zlib/zlib.c (rb_gzreader_getc): now works on characters. * ext/zlib/zlib.c (rb_gzreader_getbyte): new method to retrieve single byte. * ext/zlib/zlib.c (rb_gzreader_readbyte): ditto. * ext/zlib/zlib.c (rb_gzreader_each_byte): renamed from each_char * ext/zlib/zlib.c (rb_gzreader_ungetc): allow unget strings. * ext/zlib/zlib.c (rb_gzreader_ungetbyte): renamed from ungetc. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19869 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'include/ruby')
-rw-r--r--include/ruby/encoding.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h
index 8bd73fb61..64bfff594 100644
--- a/include/ruby/encoding.h
+++ b/include/ruby/encoding.h
@@ -94,6 +94,7 @@ VALUE rb_enc_str_buf_cat(VALUE str, const char *ptr, long len, 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 *);
+VALUE rb_str_conv_enc(VALUE str, rb_encoding *from, rb_encoding *to);
/* index -> rb_encoding */
rb_encoding* rb_enc_from_index(int idx);