1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* revert previous revision. it's already out-of-date.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21735 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2009-01-22 07:13:40 +00:00
parent a3e8d63a75
commit 9e83ce20b1
4 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Thu Jan 22 16:12:51 2009 NAKAMURA Usaku <usa@ruby-lang.org>
* revert previous revision. it's already out-of-date.
Thu Jan 22 15:54:02 2009 NAKAMURA Usaku <usa@ruby-lang.org> Thu Jan 22 15:54:02 2009 NAKAMURA Usaku <usa@ruby-lang.org>
* include/ruby/win32.h, win32/win32.c (rb_w32_is_valid_fd): new function * include/ruby/win32.h, win32/win32.c (rb_w32_is_valid_fd): new function

1
include/ruby/win32.h
View File

@ -214,7 +214,6 @@ extern int WSAAPI rb_w32_connect(int, const struct sockaddr *, int);
extern void rb_w32_fdset(int, fd_set*); extern void rb_w32_fdset(int, fd_set*);
extern void rb_w32_fdclr(int, fd_set*); extern void rb_w32_fdclr(int, fd_set*);
extern int rb_w32_fdisset(int, fd_set*); extern int rb_w32_fdisset(int, fd_set*);
extern int rb_w32_is_valid_fd(int);
extern int WSAAPI rb_w32_select(int, fd_set *, fd_set *, fd_set *, struct timeval *); extern int WSAAPI rb_w32_select(int, fd_set *, fd_set *, fd_set *, struct timeval *);
extern int WSAAPI rb_w32_getpeername(int, struct sockaddr *, int *); extern int WSAAPI rb_w32_getpeername(int, struct sockaddr *, int *);
extern int WSAAPI rb_w32_getsockname(int, struct sockaddr *, int *); extern int WSAAPI rb_w32_getsockname(int, struct sockaddr *, int *);

6
io.c
View File

@ -5971,15 +5971,13 @@ rb_io_initialize(int argc, VALUE *argv, VALUE io)
fd = NUM2INT(fnum); fd = NUM2INT(fnum);
if (fstat(fd, &st) == -1) rb_sys_fail(0); if (fstat(fd, &st) == -1) rb_sys_fail(0);
UPDATE_MAXFD(fd); UPDATE_MAXFD(fd);
#if defined(HAVE_FCNTL) && defined(F_GETFL)
if (NIL_P(vmode)) { if (NIL_P(vmode)) {
#if defined(HAVE_FCNTL) && defined(F_GETFL)
oflags = fcntl(fd, F_GETFL); oflags = fcntl(fd, F_GETFL);
if (oflags == -1) rb_sys_fail(0); if (oflags == -1) rb_sys_fail(0);
fmode = rb_io_oflags_fmode(oflags); fmode = rb_io_oflags_fmode(oflags);
}
#elif defined(_WIN32)
if (rb_w32_is_valid_fd(fd)) rb_sys_fail(0);
#endif #endif
}
MakeOpenFile(io, fp); MakeOpenFile(io, fp);
fp->fd = fd; fp->fd = fd;
fp->mode = fmode; fp->mode = fmode;

9
win32/win32.c
View File

@ -1836,15 +1836,6 @@ rb_w32_open_osfhandle(intptr_t osfhandle, int flags)
} }
#endif #endif
int
rb_w32_is_valid_fd(int fd)
{
if (_get_osfhandle(fd) == -1)
return -1;
else
return 0;
}
#undef getsockopt #undef getsockopt
static int static int