diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-01-03 18:12:16 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-01-03 18:12:16 +0000 |
| commit | de6c5ae9c69474e9d04ecc085fa08136fb13dea0 (patch) | |
| tree | ea7ebc1e91f9ffb6190b2370a7d6bd98e5737044 /configure.ac | |
| parent | 887dced42e51e79734c75e77bdfb69c56493e6e3 (diff) | |
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@railsexpress.de>
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@61582 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index e915cb21b7..90ce91bf7c 100644 --- a/configure.ac +++ b/configure.ac @@ -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], [ |