diff --git a/CMake/unix-cache.cmake b/CMake/unix-cache.cmake index 287c3fdf9e..4ee28f7eb7 100644 --- a/CMake/unix-cache.cmake +++ b/CMake/unix-cache.cmake @@ -226,7 +226,6 @@ set(HAVE_REALPATH 1) set(HAVE_RECV 1) set(HAVE_SA_FAMILY_T 1) set(HAVE_SCHED_YIELD 1) -set(HAVE_SELECT 1) set(HAVE_SEND 1) if(APPLE OR CYGWIN OR diff --git a/CMake/win32-cache.cmake b/CMake/win32-cache.cmake index a684b459b0..87e0879ab2 100644 --- a/CMake/win32-cache.cmake +++ b/CMake/win32-cache.cmake @@ -128,7 +128,6 @@ set(HAVE_POLL_H 0) set(HAVE_POSIX_STRERROR_R 0) set(HAVE_PWD_H 0) set(HAVE_RECV 1) -set(HAVE_SELECT 1) set(HAVE_SEND 1) set(HAVE_SENDMMSG 0) set(HAVE_SENDMSG 0) diff --git a/CMakeLists.txt b/CMakeLists.txt index ec6d1dc367..ae1152c9b3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1640,7 +1640,6 @@ check_symbol_exists("recv" "${CURL_INCLUDES}" HAVE_RECV) # proto/bsd check_symbol_exists("send" "${CURL_INCLUDES}" HAVE_SEND) # proto/bsdsocket.h sys/types.h sys/socket.h check_function_exists("sendmsg" HAVE_SENDMSG) check_function_exists("sendmmsg" HAVE_SENDMMSG) -check_symbol_exists("select" "${CURL_INCLUDES}" HAVE_SELECT) # proto/bsdsocket.h sys/select.h sys/socket.h check_symbol_exists("memrchr" "string.h" HAVE_MEMRCHR) check_symbol_exists("alarm" "unistd.h" HAVE_ALARM) check_symbol_exists("fcntl" "fcntl.h" HAVE_FCNTL) diff --git a/acinclude.m4 b/acinclude.m4 index 3528b8507e..310d680600 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -972,59 +972,6 @@ AC_DEFUN([CURL_CHECK_LIBS_CONNECT], [ ]) -dnl CURL_CHECK_FUNC_SELECT -dnl ------------------------------------------------- -dnl Test if the socket select() function is available. - -AC_DEFUN([CURL_CHECK_FUNC_SELECT], [ - AC_REQUIRE([CURL_CHECK_STRUCT_TIMEVAL]) - AC_REQUIRE([CURL_INCLUDES_BSDSOCKET]) - AC_CHECK_HEADERS(sys/select.h) - - AC_MSG_CHECKING([for select]) - AC_LINK_IFELSE([ - AC_LANG_PROGRAM([[ - #undef inline - #ifdef _WIN32 - #ifndef WIN32_LEAN_AND_MEAN - #define WIN32_LEAN_AND_MEAN - #endif - #include - #else - #include - #include - #endif - #ifdef HAVE_SYS_TYPES_H - #include - #endif - #include - #ifndef _WIN32 - #ifdef HAVE_SYS_SELECT_H - #include - #elif defined(HAVE_UNISTD_H) - #include - #endif - $curl_includes_bsdsocket - #endif - ]],[[ - select(0, 0, 0, 0, 0); - ]]) - ],[ - AC_MSG_RESULT([yes]) - curl_cv_select="yes" - ],[ - AC_MSG_RESULT([no]) - curl_cv_select="no" - ]) - - if test "$curl_cv_select" = "yes"; then - AC_DEFINE_UNQUOTED(HAVE_SELECT, 1, - [Define to 1 if you have the select function.]) - curl_cv_func_select="yes" - fi -]) - - dnl CURL_VERIFY_RUNTIMELIBS dnl ------------------------------------------------- dnl Verify that the shared libs found so far can be used when running diff --git a/configure.ac b/configure.ac index 5e9f1ac2e4..a00a2f8aa6 100644 --- a/configure.ac +++ b/configure.ac @@ -4178,8 +4178,6 @@ esac TYPE_SOCKADDR_STORAGE -CURL_CHECK_FUNC_SELECT - CURL_CHECK_FUNC_RECV CURL_CHECK_FUNC_SEND diff --git a/lib/config-mac.h b/lib/config-mac.h index fd9d3e7b60..9037dbf5c7 100644 --- a/lib/config-mac.h +++ b/lib/config-mac.h @@ -52,7 +52,6 @@ #define HAVE_SYS_IOCTL_H 1 #define HAVE_ALARM 1 #define HAVE_UTIME 1 -#define HAVE_SELECT 1 #define HAVE_SOCKET 1 #define HAVE_STRUCT_TIMEVAL 1 diff --git a/lib/config-os400.h b/lib/config-os400.h index 050fd9d7da..8ff560c920 100644 --- a/lib/config-os400.h +++ b/lib/config-os400.h @@ -142,9 +142,6 @@ /* Define to 1 if symbol `sa_family_t' exists */ #define HAVE_SA_FAMILY_T 1 -/* Define to 1 if you have the select function. */ -#define HAVE_SELECT 1 - /* Define to 1 if you have the send function. */ #define HAVE_SEND 1 diff --git a/lib/config-riscos.h b/lib/config-riscos.h index afff218a76..358544fb3c 100644 --- a/lib/config-riscos.h +++ b/lib/config-riscos.h @@ -69,9 +69,6 @@ /* Define if you have the header file. */ #define HAVE_NET_IF_H -/* Define if you have the `select' function. */ -#define HAVE_SELECT - /* Define if you have the `signal' function. */ #define HAVE_SIGNAL diff --git a/lib/config-win32.h b/lib/config-win32.h index 1f4f12f433..81f1e51cee 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -103,9 +103,6 @@ /* Define if you have a working ioctlsocket FIONBIO function. */ #define HAVE_IOCTLSOCKET_FIONBIO 1 -/* Define if you have the select function. */ -#define HAVE_SELECT 1 - /* Define if you have the setlocale function. */ #define HAVE_SETLOCALE 1 diff --git a/lib/curl_config-cmake.h.in b/lib/curl_config-cmake.h.in index 26379e88a9..7b0dd9a282 100644 --- a/lib/curl_config-cmake.h.in +++ b/lib/curl_config-cmake.h.in @@ -460,9 +460,6 @@ /* Define to 1 if you have the recv function. */ #cmakedefine HAVE_RECV 1 -/* Define to 1 if you have the select function. */ -#cmakedefine HAVE_SELECT 1 - /* Define to 1 if you have the sched_yield function. */ #cmakedefine HAVE_SCHED_YIELD 1 diff --git a/lib/curlx/wait.c b/lib/curlx/wait.c index e50a0f0af6..7610a4ba36 100644 --- a/lib/curlx/wait.c +++ b/lib/curlx/wait.c @@ -23,10 +23,6 @@ ***************************************************************************/ #include "curl_setup.h" -#ifndef HAVE_SELECT -#error "We cannot compile without select() support." -#endif - #ifdef HAVE_SYS_SELECT_H #include #elif defined(HAVE_UNISTD_H) diff --git a/lib/select.c b/lib/select.c index 281917bd70..76b56bc042 100644 --- a/lib/select.c +++ b/lib/select.c @@ -23,10 +23,6 @@ ***************************************************************************/ #include "curl_setup.h" -#if !defined(HAVE_SELECT) && !defined(HAVE_POLL) -#error "We cannot compile without select() or poll() support." -#endif - #ifdef HAVE_SYS_SELECT_H #include #elif defined(HAVE_UNISTD_H) @@ -40,7 +36,7 @@ #include "curlx/timediff.h" #include "curlx/wait.h" -#ifndef HAVE_POLL +#ifndef HAVE_POLL /* use select() */ /* * This is a wrapper around select() to aid in Windows compatibility. A * negative timeout value makes this function wait indefinitely, unless no