shyouhei	2009-06-08 10:59:39 +0900 (Mon, 08 Jun 2009)

  New Revision: 23648

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

  Log:
    merge revision(s) 22627:
    * eval.c (rb_thread_schedule): mswin32 doesn't have F_GETFD, so check
      with another method.

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

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 23647)
+++ ruby_1_8_7/ChangeLog	(revision 23648)
@@ -1,3 +1,8 @@
+Mon Jun  8 10:58:41 2009  NAKAMURA Usaku  <usa@r...>
+
+	* eval.c (rb_thread_schedule): mswin32 doesn't have F_GETFD, so check
+	  with another method.
+
 Mon Jun  8 08:15:36 2009  Yukihiro Matsumoto  <matz@r...>
 
 	* ext/bigdecimal/bigdecimal.c (VpAlloc): avoid ALLOCA_N() to avoid
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 23647)
+++ ruby_1_8_7/version.h	(revision 23648)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2009-06-08"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20090608
-#define RUBY_PATCHLEVEL 172
+#define RUBY_PATCHLEVEL 173
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_7/eval.c
===================================================================
--- ruby_1_8_7/eval.c	(revision 23647)
+++ ruby_1_8_7/eval.c	(revision 23648)
@@ -11103,7 +11103,11 @@
                     if ((FD_ISSET(fd, &readfds) ||
                          FD_ISSET(fd, &writefds) ||
                          FD_ISSET(fd, &exceptfds)) &&
+#ifndef _WIN32
                         fcntl(fd, F_GETFD, &dummy) == -1 &&
+#else
+			rb_w32_get_osfhandle(fd) == -1 &&
+#endif
                         errno == EBADF) {
                         badfd = fd;
                         break;

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