1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

merge revision(s) 57948,57950: [Backport #13304]

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 [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_4@57959 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2017-03-13 09:28:35 +00:00
parent 5398ef4904
commit 319e440d0f
2 changed files with 7 additions and 1 deletions

View file

@ -2193,6 +2193,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

View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.4.0"
#define RUBY_RELEASE_DATE "2017-03-13"
#define RUBY_PATCHLEVEL 101
#define RUBY_PATCHLEVEL 102
#define RUBY_RELEASE_YEAR 2017
#define RUBY_RELEASE_MONTH 3