From ca94967d3efd6ed837c39933c721461fc18a01bb Mon Sep 17 00:00:00 2001 From: shyouhei Date: Mon, 8 Jun 2009 01:59:39 +0000 Subject: 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 --- ChangeLog | 5 +++++ eval.c | 4 ++++ version.h | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d42749e508..9dce8fe71a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Jun 8 10:58:41 2009 NAKAMURA Usaku + + * 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 * ext/bigdecimal/bigdecimal.c (VpAlloc): avoid ALLOCA_N() to avoid 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; diff --git a/version.h b/version.h index a8d4e3e6dd..7dc9ecf88c 100644 --- a/version.h +++ b/version.h @@ -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 -- cgit v1.2.3