From d8efc9921766c72a7da1c878c4cb05cde2f0e6f6 Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Wed, 21 May 2008 14:04:14 +0000
Subject: [PATCH] fix: remove need and definition of HAVE_SOCKLEN_T symbol

---
 acinclude.m4      | 4 ----
 ares/acinclude.m4 | 4 ----
 ares/setup_once.h | 3 +--
 lib/setup_once.h  | 3 +--
 4 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 9c0443dc2..06eaafc68 100644
--- 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 2a87feff2..e7e9062a9 100644
--- 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 20969d448..59ed25cb2 100644
--- 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 83ee95cf4..b0355e289 100644
--- 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