fix: remove need and definition of HAVE_SOCKLEN_T symbol

diff --git a/acinclude.m4 b/acinclude.m4
index 9c0443dc20df3f5e5636685063d1cf94de29d636..06eaafc68cc777aa3a68ffe3673a6a5da4f7179b 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -775,8 +775,6 @@ AC_DEFUN([CURL_CHECK_TYPE_SOCKLEN_T], [
   AC_REQUIRE([CURL_CHECK_HEADER_WS2TCPIP])dnl
   AC_CHECK_TYPE([socklen_t], [
     dnl socklen_t is available
-    AC_DEFINE_UNQUOTED(HAVE_SOCKLEN_T, 1,
-      [Define to 1 if socklen_t is available or a equivalent is defined.])
   ],[
     dnl socklen_t not available
     AC_CACHE_CHECK([for socklen_t equivalent],
@@ -830,8 +828,6 @@ AC_DEFUN([CURL_CHECK_TYPE_SOCKLEN_T], [
       *)
         AC_DEFINE_UNQUOTED(socklen_t, $curl_cv_socklen_t_equiv,
           [Type to use in place of socklen_t when system does not provide it.])
-        AC_DEFINE_UNQUOTED(HAVE_SOCKLEN_T, 1,
-          [Define to 1 if socklen_t is available or a equivalent is defined.])
         ;;
     esac
   ],[

diff --git a/ares/acinclude.m4 b/ares/acinclude.m4
index 2a87feff2343f2cd492dded6f0ca35b36dc706e4..e7e9062a9f42ca9f045aa1b3c19ce26e0cb72400 100644 (file)
--- a/ares/acinclude.m4
+++ b/ares/acinclude.m4
@@ -244,8 +244,6 @@ AC_DEFUN([CURL_CHECK_TYPE_SOCKLEN_T], [
   AC_REQUIRE([CURL_CHECK_HEADER_WS2TCPIP])dnl
   AC_CHECK_TYPE([socklen_t], [
     dnl socklen_t is available
-    AC_DEFINE_UNQUOTED(HAVE_SOCKLEN_T, 1,
-      [Define to 1 if socklen_t is available or a equivalent is defined.])
   ],[
     dnl socklen_t not available
     AC_CACHE_CHECK([for socklen_t equivalent],
@@ -299,8 +297,6 @@ AC_DEFUN([CURL_CHECK_TYPE_SOCKLEN_T], [
       *)
         AC_DEFINE_UNQUOTED(socklen_t, $curl_cv_socklen_t_equiv,
           [Type to use in place of socklen_t when system does not provide it.])
-        AC_DEFINE_UNQUOTED(HAVE_SOCKLEN_T, 1,
-          [Define to 1 if socklen_t is available or a equivalent is defined.])
         ;;
     esac
   ],[

diff --git a/ares/setup_once.h b/ares/setup_once.h
index 20969d448c3a2007369474262af2d9c18e0865fd..59ed25cb2ea7db902971f53e8ff68a1b230e0352 100644 (file)
--- a/ares/setup_once.h
+++ b/ares/setup_once.h
@@ -100,11 +100,10 @@ struct timeval {
  * definition is present the other one also is available.
  */
 
-#if defined(WIN32) && !defined(HAVE_SOCKLEN_T)
+#if defined(WIN32) && !defined(HAVE_CONFIG_H)
 #  if ( defined(_MSC_VER) && !defined(INET_ADDRSTRLEN) ) || \
       (!defined(_MSC_VER) && !defined(HAVE_WS2TCPIP_H) )
 #    define socklen_t int
-#    define HAVE_SOCKLEN_T
 #  endif
 #endif
 

diff --git a/lib/setup_once.h b/lib/setup_once.h
index 83ee95cf4cd21d1a045ec10a65312af2d135408f..b0355e28922430865a9749a9e77ea0d671bd492f 100644 (file)
--- a/lib/setup_once.h
+++ b/lib/setup_once.h
@@ -107,11 +107,10 @@ struct timeval {
  * definition is present the other one also is available.
  */
 
-#if defined(WIN32) && !defined(HAVE_SOCKLEN_T)
+#if defined(WIN32) && !defined(HAVE_CONFIG_H)
 #  if ( defined(_MSC_VER) && !defined(INET_ADDRSTRLEN) ) || \
       (!defined(_MSC_VER) && !defined(HAVE_WS2TCPIP_H) )
 #    define socklen_t int
-#    define HAVE_SOCKLEN_T
 #  endif
 #endif