shyouhei	2008-06-08 06:01:48 +0900 (Sun, 08 Jun 2008)

  New Revision: 17004

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/io.c
    branches/ruby_1_8_5/version.h

  Log:
    merge revision(s) 14858:
    * io.c (fptr_finalize): clear errno first.  [ruby-talk:284492]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/io.c?r1=17004&r2=17003&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=17004&r2=17003&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=17004&r2=17003&diff_format=u

Index: ruby_1_8_5/ChangeLog
===================================================================
--- ruby_1_8_5/ChangeLog	(revision 17003)
+++ ruby_1_8_5/ChangeLog	(revision 17004)
@@ -1,3 +1,7 @@
+Sun Jun  8 06:01:25 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* io.c (fptr_finalize): clear errno first.  [ruby-talk:284492]
+
 Sun Jun  8 05:53:46 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* configure.in (TIMEZONE_VOID): check whether timezone requires zero
Index: ruby_1_8_5/version.h
===================================================================
--- ruby_1_8_5/version.h	(revision 17003)
+++ ruby_1_8_5/version.h	(revision 17004)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-08"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20080608
-#define RUBY_PATCHLEVEL 162
+#define RUBY_PATCHLEVEL 163
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_5/io.c
===================================================================
--- ruby_1_8_5/io.c	(revision 17003)
+++ ruby_1_8_5/io.c	(revision 17004)
@@ -2169,6 +2169,7 @@
 {
     int n1 = 0, n2 = 0, f1, f2 = -1;
 
+    errno = 0;
     if (fptr->f2) {
 	f2 = fileno(fptr->f2);
 	while (n2 = 0, fflush(fptr->f2) < 0) {

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/