From 259c3a1c4c78ce155053ef5d40dc2b4f6a6bbeb5 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 26 May 2010 01:35:38 +0000 Subject: [PATCH] * configure.in (rb_cv_large_fd_select): needed on mingw, even though fd_mask is not available. [ruby-core:30401] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28016 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ configure.in | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 102bda624f..9c843239fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed May 26 10:35:37 2010 Nobuyoshi Nakada + + * configure.in (rb_cv_large_fd_select): needed on mingw, even + though fd_mask is not available. [ruby-core:30401] + Tue May 25 14:00:51 2010 NARUSE, Yui * regparse.c (add_code_range_to_buf0): fix false negative diff --git a/configure.in b/configure.in index e3856d6de4..1c8233dae1 100644 --- a/configure.in +++ b/configure.in @@ -906,6 +906,7 @@ main() rb_cv_negative_time_t=no ac_cv_func_fcntl=yes ac_cv_func_flock=yes + rb_cv_large_fd_select=yes AC_LIBOBJ([langinfo]) : ${enable_win95=maybe} ], @@ -1021,7 +1022,11 @@ AC_CHECK_TYPES([struct timezone], [], [], [@%:@ifdef HAVE_TIME_H @%:@ include @%:@endif]) -AC_CHECK_TYPE(fd_mask, [AC_DEFINE(HAVE_RB_FD_INIT, 1)]) +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])]) +if test "$rb_cv_large_fd_select" = yes; then + AC_DEFINE(HAVE_RB_FD_INIT, 1) +fi dnl RUBY_DEFINT TYPENAME, SIZE, [SIGNED-OR-UNSIGNED], [INCLUDES = DEFAULT-INCLUDES] AC_DEFUN([RUBY_DEFINT], [dnl