From 09cdf7e5315711dea4ce7dcf5d99a4d41e7f658b Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 13 Jul 2024 18:47:54 +0200 Subject: [PATCH] cmake: delete unused `HAVE_LIBSSH2`, `HAVE_LIBSOCKET` macros - `HAVE_LIBSSH2`: unused in source. Not defined in CMake. - `HAVE_LIBSOCKET`: unused in source. Used internally in CMake. autotools sets them implicitly, so add them to the flag comparison ignore-list. Closes #14178 --- lib/config-os400.h | 3 --- lib/config-riscos.h | 3 --- lib/curl_config.h.cmake | 6 ------ scripts/cmp-config.pl | 2 ++ 4 files changed, 2 insertions(+), 12 deletions(-) diff --git a/lib/config-os400.h b/lib/config-os400.h index 018e90af7e..ec83be9236 100644 --- a/lib/config-os400.h +++ b/lib/config-os400.h @@ -107,9 +107,6 @@ /* Define if you have the header file. */ #undef HAVE_IO_H -/* Define if you have the `socket' library (-lsocket). */ -#undef HAVE_LIBSOCKET - /* Define if you have GSS API. */ #define HAVE_GSSAPI diff --git a/lib/config-riscos.h b/lib/config-riscos.h index eb1d26ec77..056f55405b 100644 --- a/lib/config-riscos.h +++ b/lib/config-riscos.h @@ -108,9 +108,6 @@ /* Define if you have the header file. */ #undef HAVE_IO_H -/* Define if you have the `socket' library (-lsocket). */ -#undef HAVE_LIBSOCKET - /* Define if you need the malloc.h header file even with stdlib.h */ /* #define NEED_MALLOC_H 1 */ diff --git a/lib/curl_config.h.cmake b/lib/curl_config.h.cmake index 5e5ff25d7a..631ee27b33 100644 --- a/lib/curl_config.h.cmake +++ b/lib/curl_config.h.cmake @@ -368,12 +368,6 @@ /* Define to 1 if you have the idn2.h header file. */ #cmakedefine HAVE_IDN2_H 1 -/* Define to 1 if you have the `socket' library (-lsocket). */ -#cmakedefine HAVE_LIBSOCKET 1 - -/* Define to 1 if you have the `ssh2' library (-lssh2). */ -#cmakedefine HAVE_LIBSSH2 1 - /* if zlib is available */ #cmakedefine HAVE_LIBZ 1 diff --git a/scripts/cmp-config.pl b/scripts/cmp-config.pl index ebd7c2fb23..b50d769597 100755 --- a/scripts/cmp-config.pl +++ b/scripts/cmp-config.pl @@ -47,6 +47,8 @@ my %remove = ( '#define HAVE_IOCTL 1' => 1, '#define HAVE_LDAP_SSL 1' => 1, '#define HAVE_LIBBROTLIDEC 1' => 1, + '#define HAVE_LIBSOCKET 1' => 1, + '#define HAVE_LIBSSH2 1' => 1, '#define HAVE_LIBSSL 1' => 1, '#define HAVE_LIBZSTD 1' => 1, '#define HAVE_OPENSSL3 1' => 1,