summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ext/zlib/zlib.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a8658dddc3..a54445c2d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jan 6 20:31:07 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ext/zlib/zlib.c (zstream_end): should return value. (backported
+ from CVS HEAD)
+
Thu Jan 6 19:55:13 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* win32/win32.c (rb_w32_close): didn't close socket handle.
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index 7e4baee889..b5e016eebb 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -679,7 +679,7 @@ zstream_end(z)
if (RTEST(ruby_debug)) {
rb_warning("attempt to close uninitialized zstream; ignored.");
}
- return;
+ return Qnil;
}
if (z->flags & ZSTREAM_FLAG_IN_STREAM) {
if (RTEST(ruby_debug)) {