summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-05-04 02:54:34 +0000
committerkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-05-04 02:54:34 +0000
commitd7fa4d837eff72adae21f0504fa9ccacab7f7019 (patch)
tree4fa4f70ea18d71d60775c1aed5dde1482354d86a
parent9851b0ce2fbc5934ddd00434048be4273f41102d (diff)
* io.c (rb_f_select): remove useless ifdef.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31425 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--io.c8
2 files changed, 4 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index dae0b4f4eb..a8120d2af5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
* ext/socket/init.c (wait_connectable): fix error handling code.
diff --git a/io.c b/io.c
index 425ef8083a..0087254291 100644
--- a/io.c
+++ b/io.c
@@ -7362,7 +7362,6 @@ struct select_args {
rb_fdset_t fdsets[4];
};
-#ifdef HAVE_RB_FD_INIT
static VALUE
select_call(VALUE arg)
{
@@ -7381,7 +7380,6 @@ select_end(VALUE arg)
rb_fd_term(&p->fdsets[i]);
return Qnil;
}
-#endif
static VALUE sym_normal, sym_sequential, sym_random,
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)
rb_fd_init(&args.fdsets[i]);
-#ifdef HAVE_RB_FD_INIT
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 {