summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--NEWS5
-rw-r--r--ext/io/wait/wait.c8
3 files changed, 13 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 5a97441d06..51f7590ac4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
-Wed Nov 21 22:39:28 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Nov 21 22:52:59 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/io/wait/wait.c (io_wait_readable): add alias wait_readable.
* ext/io/wait/wait.c (io_wait_writable): this is easier to use than
IO.select for a single IO object and is immune to the
diff --git a/NEWS b/NEWS
index 5dbc1a408e..22e5f3170b 100644
--- a/NEWS
+++ b/NEWS
@@ -152,6 +152,11 @@ with all sufficient information, see the ChangeLog file.
* added method:
* added main.define_method which defines a global function.
+* io/wait:
+ * new features:
+ * added IO#wait_writable method.
+ * added IO#wait_readable method as alias of IO#wait.
+
* net/http
* new features:
* Proxies are now automatically detected from the http_proxy environment
diff --git a/ext/io/wait/wait.c b/ext/io/wait/wait.c
index 531b7efef2..c7a290fd4f 100644
--- a/ext/io/wait/wait.c
+++ b/ext/io/wait/wait.c
@@ -40,7 +40,8 @@
#endif
static VALUE io_ready_p _((VALUE io));
-static VALUE io_wait _((int argc, VALUE *argv, VALUE io));
+static VALUE io_wait_readable _((int argc, VALUE *argv, VALUE io));
+static VALUE io_wait_writable _((int argc, VALUE *argv, VALUE io));
void Init_wait _((void));
/*
@@ -101,7 +102,7 @@ io_ready_p(VALUE io)
*/
static VALUE
-io_wait(int argc, VALUE *argv, VALUE io)
+io_wait_readable(int argc, VALUE *argv, VALUE io)
{
rb_io_t *fptr;
int i;
@@ -178,6 +179,7 @@ Init_wait()
{
rb_define_method(rb_cIO, "nread", io_nread, 0);
rb_define_method(rb_cIO, "ready?", io_ready_p, 0);
- rb_define_method(rb_cIO, "wait", io_wait, -1);
+ rb_define_method(rb_cIO, "wait", io_wait_readable, -1);
+ rb_define_method(rb_cIO, "wait_readable", io_wait_readable, -1);
rb_define_method(rb_cIO, "wait_writable", io_wait_writable, -1);
}