socketpair: allow CURL_DISABLE_SOCKETPAIR

... to completely disable the use of socketpair
This commit is contained in:
Daniel Stenberg 2020-08-14 15:45:08 +02:00
parent 861b45423d
commit b4a712dab0
2 changed files with 4 additions and 4 deletions

View File

@ -67,11 +67,11 @@ typedef enum {
#define CURLPIPE_ANY (CURLPIPE_MULTIPLEX) #define CURLPIPE_ANY (CURLPIPE_MULTIPLEX)
#if defined(USE_SOCKETPAIR) && !defined(USE_BLOCKING_SOCKETS) #if defined(USE_SOCKETPAIR) && !defined(USE_BLOCKING_SOCKETS) && \
!defined(CURL_DISABLE_SOCKETPAIR)
#define ENABLE_WAKEUP #define ENABLE_WAKEUP
#endif #endif
/* value for MAXIMUM CONCURRENT STREAMS upper limit */ /* value for MAXIMUM CONCURRENT STREAMS upper limit */
#define INITIAL_MAX_CONCURRENT_STREAMS ((1U << 31) - 1) #define INITIAL_MAX_CONCURRENT_STREAMS ((1U << 31) - 1)

View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 2019, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 2019, 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -23,7 +23,7 @@
#include "curl_setup.h" #include "curl_setup.h"
#include "socketpair.h" #include "socketpair.h"
#ifndef HAVE_SOCKETPAIR #if !defined(HAVE_SOCKETPAIR) && !defined(CURL_DISABLE_SOCKETPAIR)
#ifdef WIN32 #ifdef WIN32
/* /*
* This is a socketpair() implementation for Windows. * This is a socketpair() implementation for Windows.