Deprecate and rework old (fd) centric functions.

2 files changed, 7 insertions, 2 deletions

diff --git a/include/ruby/internal/intern/thread.h b/include/ruby/internal/intern/thread.h
index a12a371058..dd591474ce 100644
--- a/include/ruby/internal/intern/thread.h
+++ b/include/ruby/internal/intern/thread.h
@@ -31,8 +31,8 @@ struct timeval;
 
 /* thread.c */
 void rb_thread_schedule(void);
-void rb_thread_wait_fd(int);
-int rb_thread_fd_writable(int);
+#define rb_thread_wait_fd(fd) rb_wait_for_single_fd((fd), RUBY_IO_READABLE, NULL)
+#define rb_thread_fd_writable(fd) rb_wait_for_single_fd((fd), RUBY_IO_WRITABLE, NULL)
 void rb_thread_fd_close(int);
 int rb_thread_alone(void);
 void rb_thread_sleep(int);
diff --git a/include/ruby/io.h b/include/ruby/io.h
index bf916a5f8e..9a6b65cb2c 100644
--- a/include/ruby/io.h
+++ b/include/ruby/io.h
@@ -154,8 +154,13 @@ int rb_io_extract_encoding_option(VALUE opt, rb_encoding **enc_p, rb_encoding **
 void rb_io_extract_modeenc(VALUE *vmode_p, VALUE *vperm_p, VALUE opthash, int *oflags_p, int *fmode_p, rb_io_enc_t *convconfig_p);
 ssize_t rb_io_bufwrite(VALUE io, const void *buf, size_t size);
 
+RBIMPL_ATTR_DEPRECATED(("use rb_io_maybe_wait_readable"))
 int rb_io_wait_readable(int fd);
+
+RBIMPL_ATTR_DEPRECATED(("use rb_io_maybe_wait_writable"))
 int rb_io_wait_writable(int fd);
+
+RBIMPL_ATTR_DEPRECATED(("use rb_io_wait"))
 int rb_wait_for_single_fd(int fd, int events, struct timeval *tv);
 
 VALUE rb_io_wait(VALUE io, VALUE events, VALUE timeout);