build: remove all traces of USE_BLOCKING_SOCKETS

libcurl doesn't behave properly with the define set

Closes #6655

diff --git a/lib/config-plan9.h b/lib/config-plan9.h
index f33d3f66bfd9612ad18dfbf582ffe7e0e8042c9e..fc19c5f036fd09dadf6372b066b803c56f5835c7 100644 (file)
--- 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 bf69179fd5b2e2d9c11be9d7cc26601026aa01c9..4f8a07e9bc76f651a46171d7a356ac225a3f0004 100644 (file)
--- 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 8ae8ab10bb32e8a1708688a39396a327e1c3139b..eaeb019134556d257d156388f2a1a65f196a32f8 100644 (file)
--- 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 744406711235836eace3d0bb2e6f5205c612057b..8ced436726d2ef9e586c980a86c8e4c52590c597 100644 (file)
--- 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 b1d70d81c8749731813760b2a05fb4c9d8668ba3..edf790132ad227bb5fdf7986dcde27bc9e88a32a 100644 (file)
--- 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 4a7bde504ff3204f5e1533a1eb14187a4de899f1..fda2e9ad792343eb5c424801f8c84544f923b01d 100644 (file)
--- 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);