From: Viktor Szakats Date: Tue, 13 Jan 2026 18:44:56 +0000 (+0100) Subject: build: drop stray `ifndef` guards for local/internal macros X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2623e333fd614ce7185068907b5ee4b4a7f09283;p=thirdparty%2Fcurl.git build: drop stray `ifndef` guards for local/internal macros For: - lib/vtls: `MAX_PINNED_PUBKEY_SIZE`. - src: `UNPRINTABLE_CHAR`. - tests/server/tftpd: `PKTSIZE`. Closes #20314 --- diff --git a/lib/vtls/vtls.h b/lib/vtls/vtls.h index 112681ae57..273c6cce3f 100644 --- a/lib/vtls/vtls.h +++ b/lib/vtls/vtls.h @@ -93,9 +93,7 @@ struct ssl_peer { CURLsslset Curl_init_sslset_nolock(curl_sslbackend id, const char *name, const curl_ssl_backend ***avail); -#ifndef MAX_PINNED_PUBKEY_SIZE #define MAX_PINNED_PUBKEY_SIZE 1048576 /* 1 MiB */ -#endif curl_sslbackend Curl_ssl_backend(void); diff --git a/src/tool_setup.h b/src/tool_setup.h index a0d9d2baf5..6f9c0a004c 100644 --- a/src/tool_setup.h +++ b/src/tool_setup.h @@ -59,10 +59,8 @@ extern FILE *tool_stderr; #define CURL_OS "unknown" #endif -#ifndef UNPRINTABLE_CHAR /* define what to use for unprintable characters */ #define UNPRINTABLE_CHAR '.' -#endif #ifndef HAVE_STRDUP #include "tool_strdup.h" diff --git a/tests/server/tftpd.c b/tests/server/tftpd.c index 37761fa4c7..2b556a9321 100644 --- a/tests/server/tftpd.c +++ b/tests/server/tftpd.c @@ -108,9 +108,7 @@ struct tftphdr { * STRUCT DECLARATIONS AND DEFINES * *****************************************************************************/ -#ifndef PKTSIZE #define PKTSIZE (SEGSIZE + 4) /* SEGSIZE defined in arpa/tftp.h */ -#endif struct testcase { char *buffer; /* holds the file data to send to the client */