tidy-up: drop unused `CURL_INADDR_NONE` macro and `in_addr_t` type

Closes #16318

diff --git a/CMake/CurlTests.c b/CMake/CurlTests.c
index c5a5257672d27ac3ac040be24f75734244b13dd2..64e2eadd066ff38c911b0a7d317a332abb8101f4 100644 (file)
--- a/CMake/CurlTests.c
+++ b/CMake/CurlTests.c
@@ -106,21 +106,6 @@ int main(void)
 }
 #endif
 
-#ifdef HAVE_IN_ADDR_T
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-int main(void)
-{
-  if((in_addr_t *) 0)
-    return 0;
-  if(sizeof(in_addr_t))
-    return 0;
-  ;
-  return 0;
-}
-#endif
-
 #ifdef HAVE_BOOL_T
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 566863e3b29f8d2ef3c09b911d3cd0c7a0fb1182..b7ecfaa41577c3cd3d3ba1ad823c8d3e8bac445c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1810,7 +1810,6 @@ foreach(_curl_test IN ITEMS
     HAVE_GETHOSTBYNAME_R_3_REENTRANT
     HAVE_GETHOSTBYNAME_R_5_REENTRANT
     HAVE_GETHOSTBYNAME_R_6_REENTRANT
-    HAVE_IN_ADDR_T
     HAVE_BOOL_T
     STDC_HEADERS
     HAVE_FILE_OFFSET_BITS
@@ -1906,10 +1905,6 @@ endif()
 
 # Some other minor tests
 
-if(NOT HAVE_IN_ADDR_T)
-  set(in_addr_t "unsigned long")
-endif()
-
 if(CMAKE_COMPILER_IS_GNUCC AND APPLE)
   include(CheckCCompilerFlag)
   check_c_compiler_flag("-Wno-long-double" HAVE_C_FLAG_Wno_long_double)

diff --git a/acinclude.m4 b/acinclude.m4
index b550761a009f2846046c1be98d0192dadff208f7..6d34f5fa681d5dd8c9497ce361409c668e65c102 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -793,84 +793,6 @@ AC_DEFUN([CURL_CHECK_STRUCT_TIMEVAL], [
 ])
 
 
-dnl TYPE_IN_ADDR_T
-dnl -------------------------------------------------
-dnl Check for in_addr_t: it is used to receive the return code of inet_addr()
-dnl and a few other things.
-
-AC_DEFUN([TYPE_IN_ADDR_T], [
-  AC_CHECK_TYPE([in_addr_t], ,[
-    dnl in_addr_t not available
-    AC_CACHE_CHECK([for in_addr_t equivalent],
-      [curl_cv_in_addr_t_equiv], [
-      curl_cv_in_addr_t_equiv="unknown"
-      for t in "unsigned long" int size_t unsigned long; do
-        if test "$curl_cv_in_addr_t_equiv" = "unknown"; then
-          AC_LINK_IFELSE([
-            AC_LANG_PROGRAM([[
-              #undef inline
-              #ifdef _WIN32
-              #ifndef WIN32_LEAN_AND_MEAN
-              #define WIN32_LEAN_AND_MEAN
-              #endif
-              #include <winsock2.h>
-              #else
-              #ifdef HAVE_SYS_TYPES_H
-              #include <sys/types.h>
-              #endif
-              #ifdef HAVE_SYS_SOCKET_H
-              #include <sys/socket.h>
-              #endif
-              #ifdef HAVE_NETINET_IN_H
-              #include <netinet/in.h>
-              #endif
-              #ifdef HAVE_ARPA_INET_H
-              #include <arpa/inet.h>
-              #endif
-              #endif
-            ]],[[
-              $t data = inet_addr ("1.2.3.4");
-            ]])
-          ],[
-            curl_cv_in_addr_t_equiv="$t"
-          ])
-        fi
-      done
-    ])
-    case "$curl_cv_in_addr_t_equiv" in
-      unknown)
-        AC_MSG_ERROR([Cannot find a type to use in place of in_addr_t])
-        ;;
-      *)
-        AC_DEFINE_UNQUOTED(in_addr_t, $curl_cv_in_addr_t_equiv,
-          [Type to use in place of in_addr_t when system does not provide it.])
-        ;;
-    esac
-  ],[
-    #undef inline
-    #ifdef _WIN32
-    #ifndef WIN32_LEAN_AND_MEAN
-    #define WIN32_LEAN_AND_MEAN
-    #endif
-    #include <winsock2.h>
-    #else
-    #ifdef HAVE_SYS_TYPES_H
-    #include <sys/types.h>
-    #endif
-    #ifdef HAVE_SYS_SOCKET_H
-    #include <sys/socket.h>
-    #endif
-    #ifdef HAVE_NETINET_IN_H
-    #include <netinet/in.h>
-    #endif
-    #ifdef HAVE_ARPA_INET_H
-    #include <arpa/inet.h>
-    #endif
-    #endif
-  ])
-])
-
-
 dnl CURL_CHECK_FUNC_CLOCK_GETTIME_MONOTONIC
 dnl -------------------------------------------------
 dnl Check if monotonic clock_gettime is available.

diff --git a/configure.ac b/configure.ac
index 45dba219b9a51f3e2dc8d99f1aaf16581037a0db..f1989db135deda97f7a5623cf7137b0037f4d636 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4005,8 +4005,6 @@ case $host_os in
     ;;
 esac
 
-TYPE_IN_ADDR_T
-
 TYPE_SOCKADDR_STORAGE
 
 CURL_CHECK_FUNC_SELECT

diff --git a/lib/config-os400.h b/lib/config-os400.h
index 0bbbc514dd47f2434717b763ebd78d9d698fc6f0..85dd2e31b050ba7e656e3cc8a2d936b11c7d99da 100644 (file)
--- a/lib/config-os400.h
+++ b/lib/config-os400.h
@@ -234,9 +234,6 @@
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
 
-/* type to use in place of in_addr_t if not defined */
-#define in_addr_t       unsigned long
-
 /* Define to `unsigned' if <sys/types.h> does not define. */
 #undef size_t
 

diff --git a/lib/config-win32.h b/lib/config-win32.h
index 7c71eb684a2e36aaf22f438ae00ece999d7cc80c..f584bed5b8d61f8e93b6ee312fd3534b8efc7768 100644 (file)
--- a/lib/config-win32.h
+++ b/lib/config-win32.h
@@ -244,9 +244,6 @@
 /*                       TYPEDEF REPLACEMENTS                       */
 /* ---------------------------------------------------------------- */
 
-/* Define if in_addr_t is not an available 'typedefed' type. */
-#define in_addr_t unsigned long
-
 /* Define if ssize_t is not an available 'typedefed' type. */
 #ifndef _SSIZE_T_DEFINED
 #  ifdef __MINGW32__

diff --git a/lib/curl_config.h.cmake b/lib/curl_config.h.cmake
index f4f3a186d4a86d6d279e7309d1ccaa892d35b2ea..cbc5ff87eef024486050cb0598585508f2b29aba 100644 (file)
--- a/lib/curl_config.h.cmake
+++ b/lib/curl_config.h.cmake
@@ -797,9 +797,6 @@ ${SIZEOF_TIME_T_CODE}
 /* Define to empty if `const' does not conform to ANSI C. */
 #cmakedefine const ${const}
 
-/* Type to use in place of in_addr_t when system does not provide it. */
-#cmakedefine in_addr_t ${in_addr_t}
-
 /* Define to `unsigned int' if <sys/types.h> does not define. */
 #cmakedefine size_t ${size_t}
 

diff --git a/lib/hostip.h b/lib/hostip.h
index 10f70b2ba82e788eb5b06de21662b3a98231195d..931b40b681239bff743e8994f95bca5f9e260c40 100644 (file)
--- a/lib/hostip.h
+++ b/lib/hostip.h
@@ -195,12 +195,6 @@ Curl_cache_addr(struct Curl_easy *data, struct Curl_addrinfo *addr,
                 const char *hostname, size_t hostlen, int port,
                 bool permanent);
 
-#ifndef INADDR_NONE
-#define CURL_INADDR_NONE (in_addr_t) ~0
-#else
-#define CURL_INADDR_NONE INADDR_NONE
-#endif
-
 /*
  * Function provided by the resolver backend to set DNS servers to use.
  */