naruse	2017-03-13 18:28:35 +0900 (Mon, 13 Mar 2017)

  New Revision: 57959

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=57959

  Log:
    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]

  Modified directories:
    branches/ruby_2_4/
  Modified files:
    branches/ruby_2_4/thread.c
    branches/ruby_2_4/version.h
Index: ruby_2_4/thread.c
===================================================================
--- ruby_2_4/thread.c	(revision 57958)
+++ ruby_2_4/thread.c	(revision 57959)
@@ -2193,6 +2193,12 @@ rb_notify_fd_close(int fd) https://github.com/ruby/ruby/blob/trunk/ruby_2_4/thread.c#L2193
     return busy;
 }
 
+void
+rb_thread_fd_close(int fd)
+{
+    while (rb_notify_fd_close(fd));
+}
+
 /*
  *  call-seq:
  *     thr.raise
Index: ruby_2_4/version.h
===================================================================
--- ruby_2_4/version.h	(revision 57958)
+++ ruby_2_4/version.h	(revision 57959)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/version.h#L1
 #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

Property changes on: ruby_2_4
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r57948,57950


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/