From fec4b77c72cb6a3a7112bda555f2b8a84aafca5c Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 2 Nov 2008 07:41:56 +0000 Subject: [PATCH] * ext/zlib/zlib.c (Init_zlib): defines readbyte instead redefining readchar. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20087 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/zlib/zlib.c | 5 +++-- version.h | 8 ++++---- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 254eb7d3b3..64aec3d4be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Nov 2 16:41:52 2008 Nobuyoshi Nakada + + * ext/zlib/zlib.c (Init_zlib): defines readbyte instead redefining + readchar. + Fri Oct 31 21:58:50 2008 Kouhei Sutou * lib/rss/converter.rb (RSS::Converter): use String#encode. 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); diff --git a/version.h b/version.h index 91e8eb0a2d..abf08e8615 100644 --- a/version.h +++ b/version.h @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.9.1" -#define RUBY_RELEASE_DATE "2008-10-31" +#define RUBY_RELEASE_DATE "2008-11-02" #define RUBY_VERSION_CODE 191 -#define RUBY_RELEASE_CODE 20081031 +#define RUBY_RELEASE_CODE 20081102 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 #define RUBY_RELEASE_YEAR 2008 -#define RUBY_RELEASE_MONTH 10 -#define RUBY_RELEASE_DAY 31 +#define RUBY_RELEASE_MONTH 11 +#define RUBY_RELEASE_DAY 2 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[];