summaryrefslogtreecommitdiff
path: root/thread.c
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-04-09 13:26:01 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-04-09 13:26:01 +0000
commit3f7e008443ea40a5747fade85bb9a915cebc2a1b (patch)
tree4ed01a796d1d5eecb5683f23ec932d48aecb5b77 /thread.c
parent0ad168551355320c091045c0bb6d4b51798bbcc0 (diff)
merge revision(s) 57948,57949,57950:
thread.c: rb_thread_fd_close [ci skip] * thread.c (rb_thread_fd_close): re-define only for abi-check, abort if called. [ruby-core:80078] [Bug #13304] thread.c: rb_thread_fd_close no longer returns thread.c: rb_thread_fd_close [ci skip] * thread.c (rb_thread_fd_close): remove deprecated. a couple of external libraries used it. [ruby-core:80078] [Bug #13304] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@58289 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread.c')
-rw-r--r--thread.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/thread.c b/thread.c
index 6e9099b9f5..e86ebee1f0 100644
--- a/thread.c
+++ b/thread.c
@@ -2187,6 +2187,12 @@ rb_notify_fd_close(int fd)
return busy;
}
+void
+rb_thread_fd_close(int fd)
+{
+ while (rb_notify_fd_close(fd));
+}
+
/*
* call-seq:
* thr.raise