diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2021-02-25 12:45:21 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2021-02-25 16:41:35 +0100 |
| commit | 1b2098c3c9580c431cc9c4b110249abfd94792ed (patch) | |
| tree | cbbd7c527a921a371eca23d8ade670efb1bc5077 | |
| parent | 71bfa5aca8bf93a47aae9632323f024dfc11b06a (diff) | |
| download | curl-1b2098c3c9580c431cc9c4b110249abfd94792ed.tar.gz | |
build: remove all traces of USE_BLOCKING_SOCKETS
libcurl doesn't behave properly with the define set
Closes #6655
| -rw-r--r-- | lib/config-plan9.h | 1 | ||||
| -rw-r--r-- | lib/config-tpf.h | 5 | ||||
| -rw-r--r-- | lib/config-vxworks.h | 3 | ||||
| -rw-r--r-- | lib/curl_config.h.cmake | 3 | ||||
| -rw-r--r-- | lib/multihandle.h | 2 | ||||
| -rw-r--r-- | lib/nonblock.c | 10 |
6 files changed, 4 insertions, 20 deletions
diff --git a/lib/config-plan9.h b/lib/config-plan9.h index f33d3f66b..fc19c5f03 100644 --- a/lib/config-plan9.h +++ b/lib/config-plan9.h @@ -201,7 +201,6 @@ #define STRERROR_R_TYPE_ARG3 int #define TIME_WITH_SYS_TIME 1 -#define USE_BLOCKING_SOCKETS 1 #define USE_MANUAL 1 #define __attribute__(x) diff --git a/lib/config-tpf.h b/lib/config-tpf.h index bf69179fd..4f8a07e9b 100644 --- a/lib/config-tpf.h +++ b/lib/config-tpf.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -617,9 +617,6 @@ /* Define if you want to enable ares support */ /* #undef USE_ARES */ -/* Define to disable non-blocking sockets */ -/* #undef USE_BLOCKING_SOCKETS */ - /* if GnuTLS is enabled */ /* #undef USE_GNUTLS */ diff --git a/lib/config-vxworks.h b/lib/config-vxworks.h index 8ae8ab10b..eaeb01913 100644 --- a/lib/config-vxworks.h +++ b/lib/config-vxworks.h @@ -838,9 +838,6 @@ /* Define if you want to enable c-ares support */ /* #undef USE_ARES */ -/* Define to disable non-blocking sockets. */ -/* #undef USE_BLOCKING_SOCKETS */ - /* if GnuTLS is enabled */ /* #undef USE_GNUTLS */ diff --git a/lib/curl_config.h.cmake b/lib/curl_config.h.cmake index 744406711..8ced43672 100644 --- a/lib/curl_config.h.cmake +++ b/lib/curl_config.h.cmake @@ -960,9 +960,6 @@ ${SIZEOF_TIME_T_CODE} /* Define if you want to enable WIN32 threaded DNS lookup */ #cmakedefine USE_THREADS_WIN32 1 -/* Define to disable non-blocking sockets. */ -#cmakedefine USE_BLOCKING_SOCKETS 1 - /* if GnuTLS is enabled */ #cmakedefine USE_GNUTLS 1 diff --git a/lib/multihandle.h b/lib/multihandle.h index b1d70d81c..edf790132 100644 --- a/lib/multihandle.h +++ b/lib/multihandle.h @@ -70,7 +70,7 @@ typedef enum { #define CURLPIPE_ANY (CURLPIPE_MULTIPLEX) -#if !defined(CURL_DISABLE_SOCKETPAIR) && !defined(USE_BLOCKING_SOCKETS) +#if !defined(CURL_DISABLE_SOCKETPAIR) #define ENABLE_WAKEUP #endif diff --git a/lib/nonblock.c b/lib/nonblock.c index 4a7bde504..fda2e9ad7 100644 --- a/lib/nonblock.c +++ b/lib/nonblock.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -47,13 +47,7 @@ int curlx_nonblock(curl_socket_t sockfd, /* operate on this */ int nonblock /* TRUE or FALSE */) { -#if defined(USE_BLOCKING_SOCKETS) - (void)sockfd; - (void)nonblock; - return 0; /* returns success */ - -#elif defined(HAVE_FCNTL_O_NONBLOCK) - +#if defined(HAVE_FCNTL_O_NONBLOCK) /* most recent unix versions */ int flags; flags = sfcntl(sockfd, F_GETFL, 0); |