merge revision(s) 22627:

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


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@23648 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 4 insertions, 0 deletions

diff --git a/eval.c b/eval.c
index 7308409df1..55e34c21ae 100644
--- a/eval.c
+++ b/eval.c
@@ -11103,7 +11103,11 @@ rb_thread_schedule()
                     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;