summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-12-15 04:07:53 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-12-15 04:07:53 +0000
commit4785d53be1884a7ec18234c421a716ddabdebc24 (patch)
tree1a2ed36a6d49f79c97fe7fc3c8da998e9b022e34
parent9ccc9cfaf3edbf4ce5be9317f402e5d0b48256fd (diff)
* win32/win32.c (rb_w32_fdisset): rollback previous commit.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7559 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--win32/win32.c5
2 files changed, 1 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index f90be81a9b..0fd04bbb5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,3 @@
-Wed Dec 15 11:03:40 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (rb_w32_fdisset): check whether fd is socket.
-
Wed Dec 15 10:30:37 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* ext/openssl/ossl_digest.c (ossl_digest_initialize): [ruby-dev:25198]
diff --git a/win32/win32.c b/win32/win32.c
index 53f8dc9c25..72ca08f55e 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -1811,10 +1811,7 @@ rb_w32_fdclr(int fd, fd_set *set)
int
rb_w32_fdisset(int fd, fd_set *set)
{
- SOCKET s = TO_SOCKET(fd);
- if (!is_socket(s))
- return 0;
- return __WSAFDIsSet(s, set);
+ return __WSAFDIsSet(TO_SOCKET(fd), set);
}
//