shyouhei	2009-09-10 10:53:25 +0900 (Thu, 10 Sep 2009)

  New Revision: 24824

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=24824

  Log:
    merge revision(s) 24496:
    * io.c (rb_sysopen): workaround for MSVCRT's bug.
      [ruby-core:24838]

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

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 24823)
+++ ruby_1_8_7/ChangeLog	(revision 24824)
@@ -1,3 +1,8 @@
+Thu Sep 10 10:53:03 2009  NAKAMURA Usaku  <usa@r...>
+
+	* io.c (rb_sysopen): workaround for MSVCRT's bug.
+	  [ruby-core:24838]
+
 Mon Sep  7 19:52:44 2009  Tanaka Akira  <akr@f...>
 
 	* eval.c (rb_thread_schedule): need select for WAIT_SELECT, even if
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 24823)
+++ ruby_1_8_7/version.h	(revision 24824)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2009-09-07"
+#define RUBY_RELEASE_DATE "2009-09-10"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20090907
-#define RUBY_PATCHLEVEL 200
+#define RUBY_RELEASE_CODE 20090910
+#define RUBY_PATCHLEVEL 201
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 9
-#define RUBY_RELEASE_DAY 7
+#define RUBY_RELEASE_DAY 10
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8_7/io.c
===================================================================
--- ruby_1_8_7/io.c	(revision 24823)
+++ ruby_1_8_7/io.c	(revision 24824)
@@ -2905,10 +2905,16 @@
 {
     int fd;
 
+#ifdef _WIN32
+    errno = EINVAL;
+#endif
     fd = open(fname, flags, mode);
     if (fd < 0) {
 	if (errno == EMFILE || errno == ENFILE) {
 	    rb_gc();
+#ifdef _WIN32
+	    errno = EINVAL;
+#endif
 	    fd = open(fname, flags, mode);
 	}
 	if (fd < 0) {

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