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

* io.c (rb_f_select): remove useless ifdef.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31425 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
kosaki 2011-05-04 02:54:34 +00:00
parent 9851b0ce2f
commit d7fa4d837e
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Wed May 4 11:51:01 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* io.c (rb_f_select): remove useless ifdef.
Wed May 4 11:42:47 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com> Wed May 4 11:42:47 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* ext/socket/init.c (wait_connectable): fix error handling code. * ext/socket/init.c (wait_connectable): fix error handling code.

8
io.c
View File

@ -7362,7 +7362,6 @@ struct select_args {
rb_fdset_t fdsets[4]; rb_fdset_t fdsets[4];
}; };
#ifdef HAVE_RB_FD_INIT
static VALUE static VALUE
select_call(VALUE arg) select_call(VALUE arg)
{ {
@ -7381,7 +7380,6 @@ select_end(VALUE arg)
rb_fd_term(&p->fdsets[i]); rb_fd_term(&p->fdsets[i]);
return Qnil; return Qnil;
} }
#endif
static VALUE sym_normal, sym_sequential, sym_random, static VALUE sym_normal, sym_sequential, sym_random,
sym_willneed, sym_dontneed, sym_noreuse; sym_willneed, sym_dontneed, sym_noreuse;
@ -7622,13 +7620,7 @@ rb_f_select(int argc, VALUE *argv, VALUE obj)
for (i = 0; i < numberof(args.fdsets); ++i) for (i = 0; i < numberof(args.fdsets); ++i)
rb_fd_init(&args.fdsets[i]); rb_fd_init(&args.fdsets[i]);
#ifdef HAVE_RB_FD_INIT
return rb_ensure(select_call, (VALUE)&args, select_end, (VALUE)&args); return rb_ensure(select_call, (VALUE)&args, select_end, (VALUE)&args);
#else
return select_internal(args.read, args.write, args.except,
args.timeout, args.fdsets);
#endif
} }
struct io_cntl_arg { struct io_cntl_arg {