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

merge revision(s) 61500: [Backport #14248]

Browse source 
fix fd mask detection on os x

	This was broken in r59440 (3215b27a9a)
	[Bug #14248]

	From: Stefan Kaes <skaes@railsexpress.de>

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@61582 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2018-01-03 18:12:16 +00:00
parent 887dced42e
commit de6c5ae9c6
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
configure.ac
View file

@ -2039,7 +2039,8 @@ AC_CHECK_TYPES([clockid_t], [], [], [@%:@ifdef HAVE_TIME_H
@%:@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], [

2
version.h
View file

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