summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-07 21:02:34 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-07 21:02:34 +0000
commit0942811e9a1fb9c92098b891fea0ec32d752db63 (patch)
treeee0a021c9027591e62a6a08f5ba1bf5d2a0f180c
parentf77e42ad2d01d52d088eb3001af651ec24132357 (diff)
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
-rw-r--r--ChangeLog4
-rw-r--r--io.c1
-rw-r--r--version.h2
3 files changed, 6 insertions, 1 deletions
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 <nobu@ruby-lang.org>
+
+ * io.c (fptr_finalize): clear errno first. [ruby-talk:284492]
+
Sun Jun 8 05:59:36 2008 Tadayoshi Funaba <tadf@dotrb.org>
* 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