naruse	2018-01-04 03:12:16 +0900 (Thu, 04 Jan 2018)

  New Revision: 61582

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

  Log:
    merge revision(s) 61500: [Backport #14248]
    
    fix fd mask detection on os x
    
    This was broken in r59440 (3215b27a9abd8de793cf517f32d8901fd421eb1c)
    [Bug #14248]
    
    From: Stefan Kaes <skaes@r...>

  Modified directories:
    branches/ruby_2_5/
  Modified files:
    branches/ruby_2_5/configure.ac
    branches/ruby_2_5/version.h
Index: ruby_2_5/configure.ac
===================================================================
--- ruby_2_5/configure.ac	(revision 61581)
+++ ruby_2_5/configure.ac	(revision 61582)
@@ -2039,7 +2039,8 @@ AC_CHECK_TYPES([clockid_t], [], [], [@%: https://github.com/ruby/ruby/blob/trunk/ruby_2_5/configure.ac#L2039
 @%:@endif])
 
 AC_CACHE_VAL([rb_cv_large_fd_select],
-    [AC_CHECK_TYPE(fd_mask, [rb_cv_large_fd_select=yes], [rb_cv_large_fd_select=no], [@%:@ifdef HAVE_SYS_SELECT_H
+    [AC_CHECK_TYPE(fd_mask, [rb_cv_large_fd_select=yes], [rb_cv_large_fd_select=no], [AC_INCLUDES_DEFAULT([])
+@%:@ifdef HAVE_SYS_SELECT_H
 @%:@ include <sys/select.h>
 @%:@endif])])
 AS_IF([test "$rb_cv_large_fd_select" = yes], [
Index: ruby_2_5/version.h
===================================================================
--- ruby_2_5/version.h	(revision 61581)
+++ ruby_2_5/version.h	(revision 61582)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_5/version.h#L1
 #define RUBY_VERSION "2.5.0"
 #define RUBY_RELEASE_DATE "2018-01-04"
-#define RUBY_PATCHLEVEL 4
+#define RUBY_PATCHLEVEL 5
 
 #define RUBY_RELEASE_YEAR 2018
 #define RUBY_RELEASE_MONTH 1
Index: ruby_2_5
===================================================================
--- ruby_2_5	(revision 61581)
+++ ruby_2_5	(revision 61582)

Property changes on: ruby_2_5
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r61500

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