From 0942811e9a1fb9c92098b891fea0ec32d752db63 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sat, 7 Jun 2008 21:02:34 +0000 Subject: merge revision(s) 14858: * io.c (fptr_finalize): clear errno first. [ruby-talk:284492] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17006 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ io.c | 1 + version.h | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index db3b79074d..ad1d97cc6c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sun Jun 8 06:02:11 2008 Nobuyoshi Nakada + + * io.c (fptr_finalize): clear errno first. [ruby-talk:284492] + Sun Jun 8 05:59:36 2008 Tadayoshi Funaba * lib/date.rb: don't freeze nil even if 1.8 will not be aware of diff --git a/io.c b/io.c index 088b678c51..62fafbe594 100644 --- a/io.c +++ b/io.c @@ -2169,6 +2169,7 @@ fptr_finalize(fptr, noraise) { int n1 = 0, n2 = 0, f1, f2 = -1; + errno = 0; if (fptr->f2) { f2 = fileno(fptr->f2); while (n2 = 0, fflush(fptr->f2) < 0) { diff --git a/version.h b/version.h index eacb4482c3..45ce1a13a3 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-08" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20080608 -#define RUBY_PATCHLEVEL 163 +#define RUBY_PATCHLEVEL 164 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit v1.2.3