diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ext/zlib/zlib.c | 2 | ||||
| -rw-r--r-- | file.c | 6 | ||||
| -rw-r--r-- | version.h | 6 |
4 files changed, 13 insertions, 9 deletions
@@ -1,3 +1,7 @@ +Thu Dec 25 00:17:53 2003 Yukihiro Matsumoto <matz@ruby-lang.org> + + * stable version 1.8.1 released. + Wed Dec 24 23:48:04 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org> * test/soap/test_basetype.rb, test/soap/marshal/test_marshal.rb @@ -20,6 +24,10 @@ Wed Dec 24 20:37:37 2003 Eric Sunshine <sunshine@sunshineco.com> LDSHARED for Rhapsody which caused linking of extension modules to fail. +Wed Dec 24 17:51:18 2003 Yukihiro Matsumoto <matz@ruby-lang.org> + + * file.c (rb_thread_flock): enable thread support again. + Wed Dec 24 16:46:08 2003 Yukihiro Matsumoto <matz@ruby-lang.org> * eval.c (catch_timer): do not call rb_thread_schedule() inside to diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index 8e320b46a4..80b45ad0c9 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -1813,7 +1813,7 @@ gzfile_read_all(gz) if (!(gz->z.flags & GZFILE_FLAG_FOOTER_FINISHED)) { gzfile_check_footer(gz); } - return Qnil; + return rb_str_new(0, 0); } dst = zstream_detach_buffer(&gz->z); @@ -2905,7 +2905,6 @@ rb_file_flock(obj, operation) { #ifndef __CHECKER__ OpenFile *fptr; - int ret; rb_secure(2); GetOpenFile(obj, fptr); @@ -2914,10 +2913,7 @@ rb_file_flock(obj, operation) fflush(GetWriteFile(fptr)); } retry: - TRAP_BEG; - ret = flock(fileno(fptr->f), NUM2INT(operation)); - TRAP_END; - if (ret < 0) { + if (flock(fileno(fptr->f), NUM2INT(operation)) < 0) { switch (errno) { case EAGAIN: case EACCES: @@ -1,11 +1,11 @@ #define RUBY_VERSION "1.8.1" -#define RUBY_RELEASE_DATE "2003-12-24" +#define RUBY_RELEASE_DATE "2003-12-25" #define RUBY_VERSION_CODE 181 -#define RUBY_RELEASE_CODE 20031224 +#define RUBY_RELEASE_CODE 20031225 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 1 #define RUBY_RELEASE_YEAR 2003 #define RUBY_RELEASE_MONTH 12 -#define RUBY_RELEASE_DAY 24 +#define RUBY_RELEASE_DAY 25 |