diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-07-22 03:02:40 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-07-22 03:02:40 +0000 |
commit | 062b4d675231fe9f8d266bed4406b6f591844fde (patch) | |
tree | f4c45bb968a684277224ef51ababb7f9782f61fe /ext/zlib/zlib.c | |
parent | 0bd71ff35455d308c838c00a7e16fd093d36e4d7 (diff) | |
download | ruby-062b4d675231fe9f8d266bed4406b6f591844fde.tar.gz |
* include/ruby/{intern,io}.h: add missing prototypes.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28710 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/zlib/zlib.c')
-rw-r--r-- | ext/zlib/zlib.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index 2523d5ff86..20218a962c 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -9,7 +9,7 @@ #include <ruby.h> #include <zlib.h> #include <time.h> -#include <ruby/encoding.h> +#include <ruby/io.h> #ifdef HAVE_VALGRIND_MEMCHECK_H # include <valgrind/memcheck.h> @@ -209,9 +209,6 @@ static VALUE rb_gzreader_readlines(int, VALUE*, VALUE); void Init_zlib(void); -int rb_io_extract_encoding_option(VALUE opt, rb_encoding **enc_p, rb_encoding **enc2_p); -VALUE rb_str_conv_enc_opts(VALUE, rb_encoding*, rb_encoding*, int, VALUE); - /*--------- Exceptions --------*/ static VALUE cZError, cStreamEnd, cNeedDict; @@ -2794,7 +2791,7 @@ static void rb_gzfile_ecopts(struct gzfile *gz, VALUE opts) { if (!NIL_P(opts)) { - rb_io_extract_encoding_option(opts, &gz->enc, &gz->enc2); + rb_io_extract_encoding_option(opts, &gz->enc, &gz->enc2, NULL); } if (gz->enc2) { gz->ecflags = rb_econv_prepare_opts(opts, &opts); |