diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/zlib/zlib.c | 5 | ||||
| -rw-r--r-- | version.h | 6 |
3 files changed, 11 insertions, 5 deletions
@@ -1,3 +1,8 @@ +Sun Nov 2 16:41:52 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/zlib/zlib.c (Init_zlib): defines readbyte instead redefining + readchar. + Sat Nov 1 07:09:40 2008 Eric Hodel <drbrain@segment7.net> * gem_prelude.rb: Don't require rubygems/defaults.rb. diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index f73d58a20d..30c3241674 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -3415,7 +3415,8 @@ rb_gzreader_readlines(int argc, VALUE *argv, VALUE obj) * Zlib::OS_UNKNOWN * The return values of Zlib::GzipFile#os_code method. */ -void Init_zlib() +void +Init_zlib() { VALUE mZlib, cZStream, cDeflate, cInflate; #if GZIP_SUPPORT @@ -3571,7 +3572,7 @@ void Init_zlib() rb_define_method(cGzipReader, "getc", rb_gzreader_getc, 0); rb_define_method(cGzipReader, "getbyte", rb_gzreader_getbyte, 0); rb_define_method(cGzipReader, "readchar", rb_gzreader_readchar, 0); - rb_define_method(cGzipReader, "readchar", rb_gzreader_readbyte, 0); + rb_define_method(cGzipReader, "readbyte", rb_gzreader_readbyte, 0); rb_define_method(cGzipReader, "each_byte", rb_gzreader_each_byte, 0); rb_define_method(cGzipReader, "each_char", rb_gzreader_each_char, 0); rb_define_method(cGzipReader, "bytes", rb_gzreader_each_byte, 0); @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.9.0" -#define RUBY_RELEASE_DATE "2008-11-01" +#define RUBY_RELEASE_DATE "2008-11-02" #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20081101 +#define RUBY_RELEASE_CODE 20081102 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_YEAR 2008 #define RUBY_RELEASE_MONTH 11 -#define RUBY_RELEASE_DAY 1 +#define RUBY_RELEASE_DAY 2 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |