romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-03 10:50:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

ifdef remaining

Browse source
This commit is contained in:
Viktor Szakats 2025-07-25 14:53:21 +02:00
parent 60f8c65dbd
commit e190256abe
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
47 changed files with 135 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/cf-socket.c
View file

@ -109,7 +109,7 @@ static void set_ipv6_v6only(curl_socket_t sockfd, int on)
static void tcpnodelay(struct Curl_easy *data, curl_socket_t sockfd)
{
#if defined(TCP_NODELAY)
#ifdef TCP_NODELAY
curl_socklen_t onoff = (curl_socklen_t) 1;
int level = IPPROTO_TCP;
char buffer[STRERROR_LEN];
@ -188,9 +188,9 @@ tcpkeepalive(struct Curl_easy *data,
sockfd, SOCKERRNO);
}
else {
#if defined(SIO_KEEPALIVE_VALS) /* Windows */
#ifdef SIO_KEEPALIVE_VALS /* Windows */
/* Windows 10, version 1709 (10.0.16299) and later versions */
#if defined(CURL_WINSOCK_KEEP_SSO)
#ifdef CURL_WINSOCK_KEEP_SSO
optval = curlx_sltosi(data->set.tcp_keepidle);
KEEPALIVE_FACTOR(optval);
if(setsockopt(sockfd, IPPROTO_TCP, TCP_KEEPIDLE,
@ -885,7 +885,7 @@ static CURLcode socket_connect_result(struct Curl_easy *data,
switch(error) {
case SOCKEINPROGRESS:
case SOCKEWOULDBLOCK:
#if defined(EAGAIN)
#ifdef EAGAIN
#if (EAGAIN) != (SOCKEWOULDBLOCK)
/* On some platforms EAGAIN and EWOULDBLOCK are the
* same value, and on others they are different, hence
@ -1237,8 +1237,8 @@ static int do_connect(struct Curl_cfilter *cf, struct Curl_easy *data,
(void)data;
if(is_tcp_fastopen) {
#if defined(CONNECT_DATA_IDEMPOTENT) /* Darwin */
# if defined(HAVE_BUILTIN_AVAILABLE)
#ifdef CONNECT_DATA_IDEMPOTENT /* Darwin */
# ifdef HAVE_BUILTIN_AVAILABLE
/* while connectx function is available since macOS 10.11 / iOS 9,
it did not have the interface declared correctly until
Xcode 9 / macOS SDK 10.13 */
@ -1505,7 +1505,7 @@ static CURLcode cf_socket_send(struct Curl_cfilter *cf, struct Curl_easy *data,
else
*pnwritten = (size_t)nwritten;
#if defined(USE_WINSOCK)
#ifdef USE_WINSOCK
if(!result)
win_update_sndbuf_size(ctx);
#endif

2
lib/curl_gssapi.c
View file

@ -34,7 +34,7 @@
#include "curl_memory.h"
#include "memdebug.h"
#if defined(__GNUC__)
#ifdef __GNUC__
#define CURL_ALIGN8 __attribute__((aligned(8)))
#else
#define CURL_ALIGN8

2
lib/curl_md4.h
View file

@ -27,7 +27,7 @@
#include "curl_setup.h"
#include <curl/curl.h>
#if defined(USE_CURL_NTLM_CORE)
#ifdef USE_CURL_NTLM_CORE
#define MD4_DIGEST_LENGTH 16

18
lib/curl_ntlm_core.c
View file

@ -24,7 +24,7 @@
#include "curl_setup.h"
#if defined(USE_CURL_NTLM_CORE)
#ifdef USE_CURL_NTLM_CORE
/*
* NTLM details:
@ -51,7 +51,7 @@
in NTLM type-3 messages.
*/
#if defined(USE_OPENSSL)
#ifdef USE_OPENSSL
#include <openssl/opensslconf.h>
#if !defined(OPENSSL_NO_DES) && !defined(OPENSSL_NO_DEPRECATED_3_0)
#define USE_OPENSSL_DES
@ -63,14 +63,14 @@
#endif
#endif
#if defined(USE_OPENSSL_DES)
#ifdef USE_OPENSSL_DES
#if defined(USE_OPENSSL)
#ifdef USE_OPENSSL
# include <openssl/des.h>
# include <openssl/md5.h>
# include <openssl/ssl.h>
# include <openssl/rand.h>
# if defined(OPENSSL_IS_AWSLC)
# ifdef OPENSSL_IS_AWSLC
# define DES_set_key_unchecked (void)DES_set_key
# define DESKEYARG(x) *x
# define DESKEY(x) &x
@ -83,7 +83,7 @@
# include <wolfssl/openssl/md5.h>
# include <wolfssl/openssl/ssl.h>
# include <wolfssl/openssl/rand.h>
# if defined(OPENSSL_COEXIST)
# ifdef OPENSSL_COEXIST
# define DES_key_schedule WOLFSSL_DES_key_schedule
# define DES_cblock WOLFSSL_DES_cblock
# define DES_set_odd_parity wolfSSL_DES_set_odd_parity
@ -146,7 +146,7 @@ static void extend_key_56_to_64(const unsigned char *key_56, char *key)
}
#endif
#if defined(USE_OPENSSL_DES)
#ifdef USE_OPENSSL_DES
/*
* Turns a 56-bit key into a 64-bit, odd parity key and sets the key. The
* key schedule ks is also set.
@ -288,7 +288,7 @@ void Curl_ntlm_core_lm_resp(const unsigned char *keys,
const unsigned char *plaintext,
unsigned char *results)
{
#if defined(USE_OPENSSL_DES)
#ifdef USE_OPENSSL_DES
DES_key_schedule ks;
setup_des_key(keys, DESKEY(ks));
@ -342,7 +342,7 @@ CURLcode Curl_ntlm_core_mk_lm_hash(const char *password,
{
/* Create LanManager hashed password. */
#if defined(USE_OPENSSL_DES)
#ifdef USE_OPENSSL_DES
DES_key_schedule ks;
setup_des_key(pw, DESKEY(ks));

2
lib/curl_ntlm_core.h
View file

@ -26,7 +26,7 @@
#include "curl_setup.h"
#if defined(USE_CURL_NTLM_CORE)
#ifdef USE_CURL_NTLM_CORE
#include "vauth/vauth.h"

4
lib/curl_sasl.c
View file

@ -557,7 +557,7 @@ CURLcode Curl_sasl_start(struct SASL *sasl, struct Curl_easy *data,
/* Calculate the supported authentication mechanism, by decreasing order of
security, as well as the initial response where appropriate */
if(sasl_choose_external(data, &sctx) ||
#if defined(USE_KERBEROS5)
#ifdef USE_KERBEROS5
sasl_choose_krb5(data, &sctx) ||
#endif
#ifdef USE_GSASL
@ -722,7 +722,7 @@ CURLcode Curl_sasl_continue(struct SASL *sasl, struct Curl_easy *data,
}
#endif
#if defined(USE_KERBEROS5)
#ifdef USE_KERBEROS5
case SASL_GSSAPI: {
struct kerberos5data *krb5 = Curl_auth_krb5_get(conn);
result = !krb5 ? CURLE_OUT_OF_MEMORY :

6
lib/curl_setup.h
View file

@ -549,11 +549,11 @@
#ifndef SIZEOF_OFF_T
# if defined(__VMS) && !defined(__VAX)
# if defined(_LARGEFILE)
# ifdef _LARGEFILE
# define SIZEOF_OFF_T 8
# endif
# elif defined(__OS400__) && defined(__ILEC400__)
# if defined(_LARGE_FILES)
# ifdef _LARGE_FILES
# define SIZEOF_OFF_T 8
# endif
# elif defined(__MVS__) && defined(__IBMC__)
@ -932,7 +932,7 @@ endings either CRLF or LF so 't' is appropriate.
/* for systems that do not detect this in configure */
#ifndef CURL_SA_FAMILY_T
# if defined(HAVE_SA_FAMILY_T)
# ifdef HAVE_SA_FAMILY_T
# define CURL_SA_FAMILY_T sa_family_t
# elif defined(HAVE_ADDRESS_FAMILY)
# define CURL_SA_FAMILY_T ADDRESS_FAMILY

6
lib/curl_sha512_256.c
View file

@ -38,7 +38,7 @@
* * Rustls
* Skip the backend if it does not support the required algorithm */
#if defined(USE_OPENSSL)
#ifdef USE_OPENSSL
# include <openssl/opensslv.h>
# if (!defined(LIBRESSL_VERSION_NUMBER) && \
defined(OPENSSL_VERSION_NUMBER) && \
@ -78,12 +78,12 @@
#if !defined(HAS_SHA512_256_IMPLEMENTATION) && defined(USE_GNUTLS)
# include <nettle/sha.h>
# if defined(SHA512_256_DIGEST_SIZE)
# ifdef SHA512_256_DIGEST_SIZE
# define USE_GNUTLS_SHA512_256 1
# endif
#endif /* ! HAS_SHA512_256_IMPLEMENTATION && USE_GNUTLS */
#if defined(USE_OPENSSL_SHA512_256)
#ifdef USE_OPENSSL_SHA512_256
/* OpenSSL does not provide macros for SHA-512/256 sizes */

4
lib/curl_threads.c
View file

@ -26,7 +26,7 @@
#include <curl/curl.h>
#if defined(USE_THREADS_POSIX)
#ifdef USE_THREADS_POSIX
# ifdef HAVE_PTHREAD_H
# include <pthread.h>
# endif
@ -39,7 +39,7 @@
/* The last #include file should be: */
#include "memdebug.h"
#if defined(USE_THREADS_POSIX)
#ifdef USE_THREADS_POSIX
struct Curl_actual_call {
unsigned int (*func)(void *);

2
lib/curl_threads.h
View file

@ -25,7 +25,7 @@
***************************************************************************/
#include "curl_setup.h"
#if defined(USE_THREADS_POSIX)
#ifdef USE_THREADS_POSIX
# define CURL_STDCALL
# define curl_mutex_t pthread_mutex_t
# define curl_thread_t pthread_t *

2
lib/curlx/nonblock.c
View file

@ -46,7 +46,7 @@
int curlx_nonblock(curl_socket_t sockfd, /* operate on this */
int nonblock /* TRUE or FALSE */)
{
#if defined(HAVE_FCNTL_O_NONBLOCK)
#ifdef HAVE_FCNTL_O_NONBLOCK
/* most recent Unix versions */
int flags;
flags = sfcntl(sockfd, F_GETFL, 0);

2
lib/curlx/wait.c
View file

@ -68,7 +68,7 @@ int curlx_wait_ms(timediff_t timeout_ms)
SET_SOCKERRNO(SOCKEINVAL);
return -1;
}
#if defined(MSDOS)
#ifdef MSDOS
delay((unsigned int)timeout_ms);
#elif defined(_WIN32)
/* prevent overflow, timeout_ms is typecast to ULONG/DWORD. */

2
lib/easy_lock.h
View file

@ -44,7 +44,7 @@
#elif defined(HAVE_ATOMIC) && defined(HAVE_STDATOMIC_H)
#include <stdatomic.h>
#if defined(HAVE_SCHED_YIELD)
#ifdef HAVE_SCHED_YIELD
#include <sched.h>
#endif

2
lib/hostip4.c
View file

@ -149,7 +149,7 @@ struct Curl_addrinfo *Curl_ipv4_resolve_r(const char *hostname,
* platforms.
*/
#if defined(HAVE_GETHOSTBYNAME_R_5)
#ifdef HAVE_GETHOSTBYNAME_R_5
/* Solaris, IRIX and more */
h = gethostbyname_r(hostname,
(struct hostent *)buf,

2
lib/hostip6.c
View file

@ -57,7 +57,7 @@
#include "curl_memory.h"
#include "memdebug.h"
#if defined(CURLRES_SYNCH)
#ifdef CURLRES_SYNCH
#ifdef DEBUG_ADDRINFO
static void dump_addrinfo(const struct Curl_addrinfo *ai)

8
lib/http.c
View file

@ -474,7 +474,7 @@ static CURLcode http_perhapsrewind(struct Curl_easy *data,
if(abort_upload) {
/* We'd like to abort the upload - but should we? */
#if defined(USE_NTLM)
#ifdef USE_NTLM
if((data->state.authproxy.picked == CURLAUTH_NTLM) ||
(data->state.authhost.picked == CURLAUTH_NTLM)) {
ongoing_auth = "NTLM";
@ -486,7 +486,7 @@ static CURLcode http_perhapsrewind(struct Curl_easy *data,
}
}
#endif
#if defined(USE_SPNEGO)
#ifdef USE_SPNEGO
/* There is still data left to send */
if((data->state.authproxy.picked == CURLAUTH_NEGOTIATE) ||
(data->state.authhost.picked == CURLAUTH_NEGOTIATE)) {
@ -3815,7 +3815,7 @@ static CURLcode http_on_response(struct Curl_easy *data,
/* At this point we have some idea about the fate of the connection.
If we are closing the connection it may result auth failure. */
#if defined(USE_NTLM)
#ifdef USE_NTLM
if(conn->bits.close &&
(((data->req.httpcode == 401) &&
(conn->http_ntlm_state == NTLMSTATE_TYPE2)) ||
@ -3825,7 +3825,7 @@ static CURLcode http_on_response(struct Curl_easy *data,
data->state.authproblem = TRUE;
}
#endif
#if defined(USE_SPNEGO)
#ifdef USE_SPNEGO
if(conn->bits.close &&
(((data->req.httpcode == 401) &&
(conn->http_negotiate_state == GSS_AUTHRECV)) ||

2
lib/http.h
View file

@ -58,7 +58,7 @@ typedef unsigned char http_majors;
#ifndef CURL_DISABLE_HTTP
#if defined(USE_HTTP3)
#ifdef USE_HTTP3
#include <stdint.h>
#endif

2
lib/http_digest.c
View file

@ -120,7 +120,7 @@ CURLcode Curl_output_digest(struct Curl_easy *data,
if(!passwdp)
passwdp = "";
#if defined(USE_WINDOWS_SSPI)
#ifdef USE_WINDOWS_SSPI
have_chlg = !!digest->input_token;
#else
have_chlg = !!digest->nonce;

2
lib/http_ntlm.c
View file

@ -45,7 +45,7 @@
/* SSL backend-specific #if branches in this file must be kept in the order
documented in curl_ntlm_core. */
#if defined(USE_WINDOWS_SSPI)
#ifdef USE_WINDOWS_SSPI
#include "curl_sspi.h"
#endif

2
lib/httpsrr.h
View file

@ -76,7 +76,7 @@ void Curl_httpsrr_cleanup(struct Curl_https_rrinfo *rrinfo);
#define HTTPS_RR_CODE_ECH 0x05
#define HTTPS_RR_CODE_IPV6 0x06
#if defined(USE_ARES)
#ifdef USE_ARES
CURLcode Curl_httpsrr_from_ares(struct Curl_easy *data,
const ares_dns_record_t *dnsrec,
struct Curl_https_rrinfo *hinfo);

2
lib/idn.c
View file

@ -51,7 +51,7 @@
#include "memdebug.h"
/* for macOS and iOS targets */
#if defined(USE_APPLE_IDN)
#ifdef USE_APPLE_IDN
#include <unicode/uidna.h>
#include <iconv.h>
#include <langinfo.h>

2
lib/if2ip.c
View file

@ -94,7 +94,7 @@ unsigned int Curl_ipv6_scope(const struct sockaddr *sa)
#if !defined(CURL_DISABLE_BINDLOCAL) || !defined(CURL_DISABLE_FTP)
#if defined(HAVE_GETIFADDRS)
#ifdef HAVE_GETIFADDRS
if2ip_result_t Curl_if2ip(int af,
#ifdef USE_IPV6

40
lib/ldap.c
View file

@ -43,7 +43,7 @@
*/
/* Wincrypt must be included before anything that could include OpenSSL. */
#if defined(USE_WIN32_CRYPTO)
#ifdef USE_WIN32_CRYPTO
#include <wincrypt.h>
/* Undefine wincrypt conflicting symbols for BoringSSL. */
#undef X509_NAME
@ -105,7 +105,7 @@
struct ldap_urldesc {
char *lud_host;
int lud_port;
#if defined(USE_WIN32_LDAP)
#ifdef USE_WIN32_LDAP
TCHAR *lud_dn;
TCHAR **lud_attrs;
#else
@ -113,7 +113,7 @@ struct ldap_urldesc {
char **lud_attrs;
#endif
int lud_scope;
#if defined(USE_WIN32_LDAP)
#ifdef USE_WIN32_LDAP
TCHAR *lud_filter;
#else
char *lud_filter;
@ -224,9 +224,9 @@ const struct Curl_handler Curl_handler_ldaps = {
};
#endif
#if defined(USE_WIN32_LDAP)
#ifdef USE_WIN32_LDAP
#if defined(USE_WINDOWS_SSPI)
#ifdef USE_WINDOWS_SSPI
static int ldap_win_bind_auth(LDAP *server, const char *user,
const char *passwd, unsigned long authflags)
{
@ -236,13 +236,13 @@ static int ldap_win_bind_auth(LDAP *server, const char *user,
memset(&cred, 0, sizeof(cred));
#if defined(USE_SPNEGO)
#ifdef USE_SPNEGO
if(authflags & CURLAUTH_NEGOTIATE) {
method = LDAP_AUTH_NEGOTIATE;
}
else
#endif
#if defined(USE_NTLM)
#ifdef USE_NTLM
if(authflags & CURLAUTH_NTLM) {
method = LDAP_AUTH_NTLM;
}
@ -292,7 +292,7 @@ static int ldap_win_bind(struct Curl_easy *data, LDAP *server,
curlx_unicodefree(inuser);
curlx_unicodefree(inpass);
}
#if defined(USE_WINDOWS_SSPI)
#ifdef USE_WINDOWS_SSPI
else {
rc = (int)ldap_win_bind_auth(server, user, passwd, data->set.httpauth);
}
@ -302,7 +302,7 @@ static int ldap_win_bind(struct Curl_easy *data, LDAP *server,
}
#endif /* #if defined(USE_WIN32_LDAP) */
#if defined(USE_WIN32_LDAP)
#ifdef USE_WIN32_LDAP
#define FREE_ON_WINLDAP(x) curlx_unicodefree(x)
#define curl_ldap_num_t ULONG
#else
@ -328,7 +328,7 @@ static CURLcode ldap_do(struct Curl_easy *data, bool *done)
#ifdef LDAP_OPT_NETWORK_TIMEOUT
struct timeval ldap_timeout = {10, 0}; /* 10 sec connection/search timeout */
#endif
#if defined(USE_WIN32_LDAP)
#ifdef USE_WIN32_LDAP
TCHAR *host = NULL;
#else
char *host = NULL;
@ -358,7 +358,7 @@ static CURLcode ldap_do(struct Curl_easy *data, bool *done)
infof(data, "LDAP local: trying to establish %s connection",
ldap_ssl ? "encrypted" : "cleartext");
#if defined(USE_WIN32_LDAP)
#ifdef USE_WIN32_LDAP
host = curlx_convert_UTF8_to_tchar(conn->host.name);
if(!host) {
result = CURLE_OUT_OF_MEMORY;
@ -516,7 +516,7 @@ static CURLcode ldap_do(struct Curl_easy *data, bool *done)
entryIterator;
entryIterator = ldap_next_entry(server, entryIterator), num++) {
BerElement *ber = NULL;
#if defined(USE_WIN32_LDAP)
#ifdef USE_WIN32_LDAP
TCHAR *attribute;
#else
char *attribute;
@ -527,7 +527,7 @@ static CURLcode ldap_do(struct Curl_easy *data, bool *done)
{
char *name;
size_t name_len;
#if defined(USE_WIN32_LDAP)
#ifdef USE_WIN32_LDAP
TCHAR *dn = ldap_get_dn(server, entryIterator);
name = curlx_convert_tchar_to_UTF8(dn);
if(!name) {
@ -574,7 +574,7 @@ static CURLcode ldap_do(struct Curl_easy *data, bool *done)
attribute = ldap_next_attribute(server, entryIterator, ber)) {
BerValue **vals;
size_t attr_len;
#if defined(USE_WIN32_LDAP)
#ifdef USE_WIN32_LDAP
char *attr = curlx_convert_tchar_to_UTF8(attribute);
if(!attr) {
if(ber)
@ -837,7 +837,7 @@ static int _ldap_url_parse2(struct Curl_easy *data,
goto quit;
}
#if defined(USE_WIN32_LDAP)
#ifdef USE_WIN32_LDAP
/* Convert the unescaped string to a tchar */
ludp->lud_dn = curlx_convert_UTF8_to_tchar(unescaped);
@ -868,7 +868,7 @@ static int _ldap_url_parse2(struct Curl_easy *data,
const char *atp = p;
/* Allocate our array (+1 for the NULL entry) */
#if defined(USE_WIN32_LDAP)
#ifdef USE_WIN32_LDAP
ludp->lud_attrs = calloc(count + 1, sizeof(TCHAR *));
#else
ludp->lud_attrs = calloc(count + 1, sizeof(char *));
@ -896,7 +896,7 @@ static int _ldap_url_parse2(struct Curl_easy *data,
goto quit;
}
#if defined(USE_WIN32_LDAP)
#ifdef USE_WIN32_LDAP
/* Convert the unescaped string to a tchar */
ludp->lud_attrs[i] = curlx_convert_UTF8_to_tchar(unescaped);
@ -960,7 +960,7 @@ static int _ldap_url_parse2(struct Curl_easy *data,
goto quit;
}
#if defined(USE_WIN32_LDAP)
#ifdef USE_WIN32_LDAP
/* Convert the unescaped string to a tchar */
ludp->lud_filter = curlx_convert_UTF8_to_tchar(unescaped);
@ -1016,7 +1016,7 @@ static void _ldap_free_urldesc(LDAPURLDesc *ludp)
if(!ludp)
return;
#if defined(USE_WIN32_LDAP)
#ifdef USE_WIN32_LDAP
curlx_unicodefree(ludp->lud_dn);
curlx_unicodefree(ludp->lud_filter);
#else
@ -1027,7 +1027,7 @@ static void _ldap_free_urldesc(LDAPURLDesc *ludp)
if(ludp->lud_attrs) {
size_t i;
for(i = 0; i < ludp->lud_attrs_dups; i++) {
#if defined(USE_WIN32_LDAP)
#ifdef USE_WIN32_LDAP
curlx_unicodefree(ludp->lud_attrs[i]);
#else
free(ludp->lud_attrs[i]);

4
lib/md5.c
View file

@ -57,7 +57,7 @@
#endif
#endif
#if defined(USE_GNUTLS)
#ifdef USE_GNUTLS
#include <nettle/md5.h>
#elif defined(USE_OPENSSL_MD5)
#include <openssl/md5.h>
@ -84,7 +84,7 @@
#include "curl_memory.h"
#include "memdebug.h"
#if defined(USE_GNUTLS)
#ifdef USE_GNUTLS
typedef struct md5_ctx my_md5_ctx;

4
lib/multi.c
View file

@ -570,11 +570,11 @@ static void multi_done_locked(struct connectdata *conn,
*/
if((data->set.reuse_forbid
#if defined(USE_NTLM)
#ifdef USE_NTLM
&& !(conn->http_ntlm_state == NTLMSTATE_TYPE2 ||
conn->proxy_ntlm_state == NTLMSTATE_TYPE2)
#endif
#if defined(USE_SPNEGO)
#ifdef USE_SPNEGO
&& !(conn->http_negotiate_state == GSS_AUTHRECV ||
conn->proxy_negotiate_state == GSS_AUTHRECV)
#endif

4
lib/rand.c
View file

@ -72,7 +72,7 @@ CURLcode Curl_win32_random(unsigned char *entropy, size_t length)
{
memset(entropy, 0, length);
#if defined(HAVE_WIN_BCRYPTGENRANDOM)
#ifdef HAVE_WIN_BCRYPTGENRANDOM
if(BCryptGenRandom(NULL, entropy, (ULONG)length,
BCRYPT_USE_SYSTEM_PREFERRED_RNG) != STATUS_SUCCESS)
return CURLE_FAILED_INIT;
@ -119,7 +119,7 @@ static CURLcode weak_random(struct Curl_easy *data,
}
#endif
#if defined(HAVE_ARC4RANDOM)
#ifdef HAVE_ARC4RANDOM
(void)data;
r = (unsigned int)arc4random();
memcpy(entropy, &r, length);

10
lib/urldata.h
View file

@ -317,7 +317,7 @@ struct ssl_general_config {
#ifndef CURL_DISABLE_DIGEST_AUTH
/* Struct used for Digest challenge-response authentication */
struct digestdata {
#if defined(USE_WINDOWS_SSPI)
#ifdef USE_WINDOWS_SSPI
BYTE *input_token;
size_t input_token_len;
CtxtHandle *http_context;
@ -745,7 +745,7 @@ struct connectdata {
CtxtHandle *sslContext;
#endif
#if defined(USE_NTLM)
#ifdef USE_NTLM
curlntlm http_ntlm_state;
curlntlm proxy_ntlm_state;
#endif
@ -1052,7 +1052,7 @@ struct UrlState {
struct Curl_async async; /* asynchronous name resolver data */
#endif
#if defined(USE_OPENSSL)
#ifdef USE_OPENSSL
/* void instead of ENGINE to avoid bleeding OpenSSL into this header */
void *engine;
/* void instead of OSSL_PROVIDER */
@ -1254,7 +1254,7 @@ enum dupstring {
STRING_FTP_ALTERNATIVE_TO_USER, /* command to send if USER/PASS fails */
STRING_FTPPORT, /* port to send with the FTP PORT command */
#endif
#if defined(HAVE_GSSAPI)
#ifdef HAVE_GSSAPI
STRING_KRB_LEVEL, /* krb security level */
#endif
#ifndef CURL_DISABLE_NETRC
@ -1619,7 +1619,7 @@ struct UserDefined {
location: */
BIT(opt_no_body); /* as set with CURLOPT_NOBODY */
BIT(verbose); /* output verbosity */
#if defined(HAVE_GSSAPI)
#ifdef HAVE_GSSAPI
BIT(krb); /* Kerberos connection requested */
#endif
BIT(reuse_forbid); /* forbidden to be reused, close after use */

2
lib/vauth/vauth.h
View file

@ -231,7 +231,7 @@ CURLcode Curl_auth_create_xoauth_bearer_message(const char *user,
const char *bearer,
struct bufref *out);
#if defined(USE_KERBEROS5)
#ifdef USE_KERBEROS5
#ifdef HAVE_GSSAPI
# ifdef HAVE_GSSGNU

8
lib/vquic/curl_osslq.c
View file

@ -119,15 +119,15 @@ static const char *osslq_SSL_ERROR_to_str(int err)
return "SSL_ERROR_WANT_CONNECT";
case SSL_ERROR_WANT_ACCEPT:
return "SSL_ERROR_WANT_ACCEPT";
#if defined(SSL_ERROR_WANT_ASYNC)
#ifdef SSL_ERROR_WANT_ASYNC
case SSL_ERROR_WANT_ASYNC:
return "SSL_ERROR_WANT_ASYNC";
#endif
#if defined(SSL_ERROR_WANT_ASYNC_JOB)
#ifdef SSL_ERROR_WANT_ASYNC_JOB
case SSL_ERROR_WANT_ASYNC_JOB:
return "SSL_ERROR_WANT_ASYNC_JOB";
#endif
#if defined(SSL_ERROR_WANT_EARLY)
#ifdef SSL_ERROR_WANT_EARLY
case SSL_ERROR_WANT_EARLY:
return "SSL_ERROR_WANT_EARLY";
#endif
@ -514,7 +514,7 @@ static CURLcode cf_osslq_ssl_err(struct Curl_cfilter *cf,
else
err_descr = "SSL certificate verification failed";
}
#if defined(SSL_R_TLSV13_ALERT_CERTIFICATE_REQUIRED)
#ifdef SSL_R_TLSV13_ALERT_CERTIFICATE_REQUIRED
/* SSL_R_TLSV13_ALERT_CERTIFICATE_REQUIRED is only available on
OpenSSL version above v1.1.1, not LibreSSL, BoringSSL, or AWS-LC */
else if((lib == ERR_LIB_SSL) &&

2
lib/vquic/vquic.c
View file

@ -612,7 +612,7 @@ CURLcode vquic_recv_packets(struct Curl_cfilter *cf,
vquic_recv_pkt_cb *recv_cb, void *userp)
{
CURLcode result;
#if defined(HAVE_SENDMMSG)
#ifdef HAVE_SENDMMSG
result = recvmmsg_packets(cf, data, qctx, max_pkts, recv_cb, userp);
#elif defined(HAVE_SENDMSG)
result = recvmsg_packets(cf, data, qctx, max_pkts, recv_cb, userp);

2
lib/vssh/curl_path.c
View file

@ -24,7 +24,7 @@
#include "../curl_setup.h"
#if defined(USE_SSH)
#ifdef USE_SSH
#include "curl_path.h"
#include <curl/curl.h>

6
lib/vssh/ssh.h
View file

@ -26,7 +26,7 @@
#include "../curl_setup.h"
#if defined(USE_LIBSSH2)
#ifdef USE_LIBSSH2
#include <libssh2.h>
#include <libssh2_sftp.h>
#elif defined(USE_LIBSSH)
@ -162,7 +162,7 @@ struct ssh_conn {
int orig_waitfor; /* default READ/WRITE bits wait for */
char *slash_pos; /* used by the SFTP_CREATE_DIRS state */
#if defined(USE_LIBSSH)
#ifdef USE_LIBSSH
CURLcode actualcode; /* the actual error code */
char *readdir_linkPath;
size_t readdir_len;
@ -228,7 +228,7 @@ struct ssh_conn {
#endif
#endif
#if defined(USE_LIBSSH2)
#ifdef USE_LIBSSH2
/* Feature detection based on version numbers to better work with
non-configure platforms */

12
lib/vtls/cipher_suite.c
View file

@ -80,7 +80,7 @@ static const char *cs_txt =
"SHA" "\0"
"SHA256" "\0"
"SHA384" "\0"
#if defined(USE_MBEDTLS)
#ifdef USE_MBEDTLS
"ARIA" "\0"
"ARIA128" "\0"
"ARIA256" "\0"
@ -121,7 +121,7 @@ enum {
CS_TXT_IDX_SHA,
CS_TXT_IDX_SHA256,
CS_TXT_IDX_SHA384,
#if defined(USE_MBEDTLS)
#ifdef USE_MBEDTLS
CS_TXT_IDX_ARIA,
CS_TXT_IDX_ARIA128,
CS_TXT_IDX_ARIA256,
@ -180,7 +180,7 @@ static const struct cs_entry cs_list [] = {
CS_ENTRY(0xCCA8, ECDHE,RSA,CHACHA20,POLY1305,,,,),
CS_ENTRY(0xCCA9, TLS,ECDHE,ECDSA,WITH,CHACHA20,POLY1305,SHA256,),
CS_ENTRY(0xCCA9, ECDHE,ECDSA,CHACHA20,POLY1305,,,,),
#if defined(USE_MBEDTLS)
#ifdef USE_MBEDTLS
CS_ENTRY(0x002F, TLS,RSA,WITH,AES,128,CBC,SHA,),
CS_ENTRY(0x002F, AES128,SHA,,,,,,),
CS_ENTRY(0x0035, TLS,RSA,WITH,AES,256,CBC,SHA,),
@ -234,7 +234,7 @@ static const struct cs_entry cs_list [] = {
CS_ENTRY(0xC032, TLS,ECDH,RSA,WITH,AES,256,GCM,SHA384),
CS_ENTRY(0xC032, ECDH,RSA,AES256,GCM,SHA384,,,),
#endif
#if defined(USE_MBEDTLS)
#ifdef USE_MBEDTLS
CS_ENTRY(0x0001, TLS,RSA,WITH,NULL,MD5,,,),
CS_ENTRY(0x0001, NULL,MD5,,,,,,),
CS_ENTRY(0x0002, TLS,RSA,WITH,NULL,SHA,,,),
@ -322,7 +322,7 @@ static const struct cs_entry cs_list [] = {
CS_ENTRY(0xCCAB, TLS,PSK,WITH,CHACHA20,POLY1305,SHA256,,),
CS_ENTRY(0xCCAB, PSK,CHACHA20,POLY1305,,,,,),
#endif
#if defined(USE_MBEDTLS)
#ifdef USE_MBEDTLS
CS_ENTRY(0xC09C, TLS,RSA,WITH,AES,128,CCM,,),
CS_ENTRY(0xC09C, AES128,CCM,,,,,,),
CS_ENTRY(0xC09D, TLS,RSA,WITH,AES,256,CCM,,),
@ -340,7 +340,7 @@ static const struct cs_entry cs_list [] = {
CS_ENTRY(0xC0AF, TLS,ECDHE,ECDSA,WITH,AES,256,CCM,8),
CS_ENTRY(0xC0AF, ECDHE,ECDSA,AES256,CCM8,,,,),
#endif
#if defined(USE_MBEDTLS)
#ifdef USE_MBEDTLS
/* entries marked ns are "non-standard", they are not in OpenSSL */
CS_ENTRY(0x0041, TLS,RSA,WITH,CAMELLIA,128,CBC,SHA,),
CS_ENTRY(0x0041, CAMELLIA128,SHA,,,,,,),

6
lib/vtls/gtls.c
View file

@ -892,15 +892,15 @@ static CURLcode gtls_client_init(struct Curl_cfilter *cf,
* on QUIC this is common. */
init_flags |= GNUTLS_ENABLE_EARLY_DATA;
#if defined(GNUTLS_FORCE_CLIENT_CERT)
#ifdef GNUTLS_FORCE_CLIENT_CERT
init_flags |= GNUTLS_FORCE_CLIENT_CERT;
#endif
#if defined(GNUTLS_NO_TICKETS_TLS12)
#ifdef GNUTLS_NO_TICKETS_TLS12
init_flags |= GNUTLS_NO_TICKETS_TLS12;
#endif
#if defined(GNUTLS_NO_STATUS_REQUEST)
#ifdef GNUTLS_NO_STATUS_REQUEST
if(!config->verifystatus)
/* Disable the "status_request" TLS extension, enabled by default since
GnuTLS 3.8.0. */

6
lib/vtls/mbedtls.c
View file

@ -880,12 +880,12 @@ mbed_connect_step1(struct Curl_cfilter *cf, struct Curl_easy *data)
}
#if defined(MBEDTLS_SSL_RENEGOTIATION)
#ifdef MBEDTLS_SSL_RENEGOTIATION
mbedtls_ssl_conf_renegotiation(&backend->config,
MBEDTLS_SSL_RENEGOTIATION_ENABLED);
#endif
#if defined(MBEDTLS_SSL_SESSION_TICKETS)
#ifdef MBEDTLS_SSL_SESSION_TICKETS
mbedtls_ssl_conf_session_tickets(&backend->config,
MBEDTLS_SSL_SESSION_TICKETS_DISABLED);
#endif
@ -1426,7 +1426,7 @@ static size_t mbedtls_version(char *buffer, size_t size)
static CURLcode mbedtls_random(struct Curl_easy *data,
unsigned char *entropy, size_t length)
{
#if defined(MBEDTLS_CTR_DRBG_C)
#ifdef MBEDTLS_CTR_DRBG_C
int ret;
mbedtls_entropy_context ctr_entropy;
mbedtls_ctr_drbg_context ctr_drbg;

8
lib/vtls/openssl.c
View file

@ -1124,7 +1124,7 @@ static bool is_pkcs11_uri(const char *string)
#endif
static CURLcode ossl_set_engine(struct Curl_easy *data, const char *engine);
#if defined(OPENSSL_HAS_PROVIDERS)
#ifdef OPENSSL_HAS_PROVIDERS
static CURLcode ossl_set_provider(struct Curl_easy *data,
const char *provider);
#endif
@ -1378,7 +1378,7 @@ int cert_stuff(struct Curl_easy *data,
}
break;
#endif
#if defined(OPENSSL_HAS_PROVIDERS)
#ifdef OPENSSL_HAS_PROVIDERS
/* fall through to compatible provider */
case SSL_FILETYPE_PROVIDER:
{
@ -1631,7 +1631,7 @@ fail:
}
break;
#endif
#if defined(OPENSSL_HAS_PROVIDERS)
#ifdef OPENSSL_HAS_PROVIDERS
/* fall through to compatible provider */
case SSL_FILETYPE_PROVIDER:
{
@ -1967,7 +1967,7 @@ static struct curl_slist *ossl_engines_list(struct Curl_easy *data)
return list;
}
#if defined(OPENSSL_HAS_PROVIDERS)
#ifdef OPENSSL_HAS_PROVIDERS
static void ossl_provider_cleanup(struct Curl_easy *data)
{

6
lib/vtls/rustls.c
View file

@ -583,7 +583,7 @@ init_config_builder(struct Curl_easy *data,
goto cleanup;
}
#if defined(USE_ECH)
#ifdef USE_ECH
if(ECH_ENABLED(data)) {
tls_versions[0] = RUSTLS_TLS_VERSION_TLSV1_3;
tls_versions_len = 1;
@ -918,7 +918,7 @@ cleanup:
return result;
}
#if defined(USE_ECH)
#ifdef USE_ECH
static CURLcode
init_config_builder_ech(struct Curl_easy *data,
const struct ssl_connect_data *connssl,
@ -1077,7 +1077,7 @@ cr_init_backend(struct Curl_cfilter *cf, struct Curl_easy *data,
}
}
#if defined(USE_ECH)
#ifdef USE_ECH
if(ECH_ENABLED(data)) {
result = init_config_builder_ech(data, connssl, config_builder);
if(result != CURLE_OK && data->set.tls_ech & CURLECH_HARD) {

4
lib/vtls/schannel.h
View file

@ -37,7 +37,7 @@
#pragma warning(pop)
#endif
/* Wincrypt must be included before anything that could include OpenSSL. */
#if defined(USE_WIN32_CRYPTO)
#ifdef USE_WIN32_CRYPTO
#include <wincrypt.h>
/* Undefine wincrypt conflicting symbols for BoringSSL. */
#undef X509_NAME
@ -68,7 +68,7 @@
* BoringSSL's <openssl/x509.h>: So just undefine those defines here
* (and only here).
*/
#if defined(OPENSSL_IS_BORINGSSL)
#ifdef OPENSSL_IS_BORINGSSL
# undef X509_NAME
# undef X509_CERT_PAIR
# undef X509_EXTENSIONS

4
lib/vtls/schannel_verify.c
View file

@ -390,7 +390,7 @@ static DWORD cert_get_name_string(struct Curl_easy *data,
BOOL Win8_compat)
{
DWORD actual_length = 0;
#if defined(CURL_WINDOWS_UWP)
#ifdef CURL_WINDOWS_UWP
(void)data;
(void)cert_context;
(void)host_names;
@ -510,7 +510,7 @@ static bool get_alt_name_info(struct Curl_easy *data,
LPDWORD alt_name_info_size)
{
bool result = FALSE;
#if defined(CURL_WINDOWS_UWP)
#ifdef CURL_WINDOWS_UWP
(void)data;
(void)ctx;
(void)alt_name_info;

18
lib/vtls/vtls.c
View file

@ -972,7 +972,7 @@ static const struct Curl_ssl Curl_ssl_multi = {
};
const struct Curl_ssl *Curl_ssl =
#if defined(CURL_WITH_MULTI_SSL)
#ifdef CURL_WITH_MULTI_SSL
&Curl_ssl_multi;
#elif defined(USE_WOLFSSL)
&Curl_ssl_wolfssl;
@ -991,22 +991,22 @@ const struct Curl_ssl *Curl_ssl =
#endif
static const struct Curl_ssl *available_backends[] = {
#if defined(USE_WOLFSSL)
#ifdef USE_WOLFSSL
&Curl_ssl_wolfssl,
#endif
#if defined(USE_GNUTLS)
#ifdef USE_GNUTLS
&Curl_ssl_gnutls,
#endif
#if defined(USE_MBEDTLS)
#ifdef USE_MBEDTLS
&Curl_ssl_mbedtls,
#endif
#if defined(USE_OPENSSL)
#ifdef USE_OPENSSL
&Curl_ssl_openssl,
#endif
#if defined(USE_SCHANNEL)
#ifdef USE_SCHANNEL
&Curl_ssl_schannel,
#endif
#if defined(USE_RUSTLS)
#ifdef USE_RUSTLS
&Curl_ssl_rustls,
#endif
NULL
@ -1019,7 +1019,7 @@ void Curl_ssl_cleanup(void)
/* only cleanup if we did a previous init */
if(Curl_ssl->cleanup)
Curl_ssl->cleanup();
#if defined(CURL_WITH_MULTI_SSL)
#ifdef CURL_WITH_MULTI_SSL
Curl_ssl = &Curl_ssl_multi;
#endif
init_ssl = FALSE;
@ -1124,7 +1124,7 @@ CURLsslset Curl_init_sslset_nolock(curl_sslbackend id, const char *name,
return id == Curl_ssl->info.id ||
(name && curl_strequal(name, Curl_ssl->info.name)) ?
CURLSSLSET_OK :
#if defined(CURL_WITH_MULTI_SSL)
#ifdef CURL_WITH_MULTI_SSL
CURLSSLSET_TOO_LATE;
#else
CURLSSLSET_UNKNOWN_BACKEND;

2
m4/curl-functions.m4
View file

@ -407,7 +407,7 @@ dnl included when bsdsocket.h is to be included.
AC_DEFUN([CURL_INCLUDES_BSDSOCKET], [
curl_includes_bsdsocket="\
/* includes start */
#if defined(HAVE_PROTO_BSDSOCKET_H)
#ifdef HAVE_PROTO_BSDSOCKET_H
# define __NO_NET_API
# define __USE_INLINE__
# include <proto/bsdsocket.h>

4
src/tool_main.c
View file

@ -61,8 +61,8 @@
int vms_show = 0;
#endif
#if defined(__AMIGA__)
#if defined(__GNUC__)
#ifdef __AMIGA__
#ifdef __GNUC__
#define CURL_USED __attribute__((used))
#else
#define CURL_USED

2
src/tool_operate.c
View file

@ -2104,7 +2104,7 @@ static CURLcode cacertpaths(struct OperationConfig *config)
#ifdef _WIN32
if(!env) {
#if defined(CURL_CA_SEARCH_SAFE)
#ifdef CURL_CA_SEARCH_SAFE
char *cacert = NULL;
FILE *cafile = tool_execpath("curl-ca-bundle.crt", &cacert);
if(cafile) {

2
tests/http/testenv/mod_curltest/mod_curltest.c
View file

@ -51,7 +51,7 @@ AP_DECLARE_MODULE(curltest) =
NULL, /* func to merge per server config */
NULL, /* command handlers */
curltest_hooks,
#if defined(AP_MODULE_FLAG_NONE)
#ifdef AP_MODULE_FLAG_NONE
AP_MODULE_FLAG_ALWAYS_MERGE
#endif
};

10
tests/server/resolve.c
View file

@ -42,7 +42,7 @@ static int test_resolve(int argc, char *argv[])
while(argc > arg) {
if(!strcmp("--version", argv[arg])) {
printf("resolve IPv4%s\n",
#if defined(CURLRES_IPV6)
#ifdef CURLRES_IPV6
"/IPv6"
#else
""
@ -51,7 +51,7 @@ static int test_resolve(int argc, char *argv[])
return 0;
}
else if(!strcmp("--ipv6", argv[arg])) {
#if defined(CURLRES_IPV6)
#ifdef CURLRES_IPV6
ipv_inuse = "IPv6";
use_ipv6 = TRUE;
arg++;
@ -63,7 +63,7 @@ static int test_resolve(int argc, char *argv[])
else if(!strcmp("--ipv4", argv[arg])) {
/* for completeness, we support this option as well */
ipv_inuse = "IPv4";
#if defined(CURLRES_IPV6)
#ifdef CURLRES_IPV6
use_ipv6 = FALSE;
#endif
arg++;
@ -76,7 +76,7 @@ static int test_resolve(int argc, char *argv[])
puts("Usage: resolve [option] <host>\n"
" --version\n"
" --ipv4"
#if defined(CURLRES_IPV6)
#ifdef CURLRES_IPV6
"\n --ipv6"
#endif
);
@ -88,7 +88,7 @@ static int test_resolve(int argc, char *argv[])
return 2;
#endif
#if defined(CURLRES_IPV6)
#ifdef CURLRES_IPV6
if(use_ipv6) {
/* Check that the system has IPv6 enabled before checking the resolver */
curl_socket_t s = socket(PF_INET6, SOCK_DGRAM, 0);

2
tests/server/tftpd.c
View file

@ -508,7 +508,7 @@ static int synchnet(curl_socket_t f /* socket to flush */)
curl_socklen_t fromaddrlen;
for(;;) {
#if defined(HAVE_IOCTLSOCKET_CAMEL_FIONBIO)
#ifdef HAVE_IOCTLSOCKET_CAMEL_FIONBIO
long i;
(void)IoctlSocket(f, FIONBIO, &i);
#elif defined(HAVE_IOCTLSOCKET)

12
tests/unit/unit3205.c
View file

@ -60,7 +60,7 @@ static CURLcode test_unit3205(char *arg)
"ECDHE-RSA-CHACHA20-POLY1305" },
{ 0xCCA9, "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256",
"ECDHE-ECDSA-CHACHA20-POLY1305" },
#if defined(USE_MBEDTLS)
#ifdef USE_MBEDTLS
{ 0x002F, "TLS_RSA_WITH_AES_128_CBC_SHA",
"AES128-SHA" },
{ 0x0035, "TLS_RSA_WITH_AES_256_CBC_SHA",
@ -451,19 +451,19 @@ static CURLcode test_unit3205(char *arg)
{ 0xC030, "ECDHE-RSA-AES256-GCM-SHA384"},
{ 0xCCA9, "ECDHE-ECDSA-CHACHA20-POLY1305"},
{ 0xCCA8, "ECDHE-RSA-CHACHA20-POLY1305"},
#if defined(USE_MBEDTLS)
#ifdef USE_MBEDTLS
{ 0x009E, "DHE-RSA-AES128-GCM-SHA256"},
{ 0x009F, "DHE-RSA-AES256-GCM-SHA384"},
#else
{ 0x0000, "DHE-RSA-AES128-GCM-SHA256"},
{ 0x0000, "DHE-RSA-AES256-GCM-SHA384"},
#endif
#if defined(USE_MBEDTLS)
#ifdef USE_MBEDTLS
{ 0xCCAA, "DHE-RSA-CHACHA20-POLY1305"},
#else
{ 0x0000, "DHE-RSA-CHACHA20-POLY1305"},
#endif
#if defined(USE_MBEDTLS)
#ifdef USE_MBEDTLS
{ 0xC023, "ECDHE-ECDSA-AES128-SHA256" },
{ 0xC027, "ECDHE-RSA-AES128-SHA256" },
{ 0xC009, "ECDHE-ECDSA-AES128-SHA" },
@ -482,14 +482,14 @@ static CURLcode test_unit3205(char *arg)
{ 0x0000, "ECDHE-ECDSA-AES256-SHA" },
{ 0x0000, "ECDHE-RSA-AES256-SHA" },
#endif
#if defined(USE_MBEDTLS)
#ifdef USE_MBEDTLS
{ 0x0067, "DHE-RSA-AES128-SHA256" },
{ 0x006B, "DHE-RSA-AES256-SHA256" },
#else
{ 0x0000, "DHE-RSA-AES128-SHA256" },
{ 0x0000, "DHE-RSA-AES256-SHA256" },
#endif
#if defined(USE_MBEDTLS)
#ifdef USE_MBEDTLS
{ 0x009C, "AES128-GCM-SHA256" },
{ 0x009D, "AES256-GCM-SHA384" },
{ 0x003C, "AES128-SHA256" },