From 1d64a2bf5b46f0639cc07e674bf502cbd16c391d Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 14 Oct 2022 17:31:19 +0000 Subject: [PATCH] cmake: delete duplicate HAVE_GETADDRINFO test A custom `HAVE_GETADDRINFO` check came with the initial CMake commit [1]. A later commit [2] added a standard check for it as well. The standard check run before the custom one, so CMake ignored the latter. The custom check was also non-portable, so this patch deletes it in favor of the standard check. [1] 4c5307b45655ba75ab066564afdc0c111a8b9291 [2] aec7c5a87c8482b6ddffa352d7d220698652262e Closes #9731 --- CMake/CurlTests.c | 22 ---------------------- CMakeLists.txt | 1 - 2 files changed, 23 deletions(-) diff --git a/CMake/CurlTests.c b/CMake/CurlTests.c index 0ea7a541f0..6a9fdea098 100644 --- a/CMake/CurlTests.c +++ b/CMake/CurlTests.c @@ -184,28 +184,6 @@ if (sizeof (bool *) ) #include int main() { return 0; } #endif -#ifdef HAVE_GETADDRINFO -#include -#include -#include - -int main(void) { - struct addrinfo hints, *ai; - int error; - - memset(&hints, 0, sizeof(hints)); - hints.ai_family = AF_UNSPEC; - hints.ai_socktype = SOCK_STREAM; -#ifndef getaddrinfo - (void)getaddrinfo; -#endif - error = getaddrinfo("127.0.0.1", "8080", &hints, &ai); - if (error) { - return 1; - } - return 0; -} -#endif #ifdef HAVE_FILE_OFFSET_BITS #ifdef _FILE_OFFSET_BITS #undef _FILE_OFFSET_BITS diff --git a/CMakeLists.txt b/CMakeLists.txt index 156fe79039..70ef457cf4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1130,7 +1130,6 @@ foreach(CURL_TEST HAVE_IN_ADDR_T HAVE_BOOL_T STDC_HEADERS - HAVE_GETADDRINFO HAVE_FILE_OFFSET_BITS HAVE_VARIADIC_MACROS_C99 HAVE_VARIADIC_MACROS_GCC