Test CURL_CHECK_TYPE_SOCKLEN_T

diff --git a/acinclude.m4 b/acinclude.m4
index 70c92ad2476157616102bd26004863d1a8c8d84c..335281ca8874a6cc18aa5469e353445a0018846c 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -125,9 +125,9 @@ dnl used while this notice is in place --------------
 AC_DEFUN([CURL_CHECK_TYPE_SOCKLEN_T], [
   AC_REQUIRE([CURL_CHECK_HEADER_WS2TCPIP])dnl
   AC_CHECK_TYPE([socklen_t], ,[
-    AC_CACHE_CHECK([for socklen_t equivalent bis], 
-      [curl_cv_socklen_t_equiv_bis], [
-      curl_cv_socklen_t_equiv_bis=
+    AC_CACHE_CHECK([for socklen_t equivalent], 
+      [curl_cv_socklen_t_equiv], [
+      curl_cv_socklen_t_equiv=
       for arg2 in "struct sockaddr" void; do
         for t in int size_t unsigned long "unsigned long"; do
           AC_COMPILE_IFELSE([
@@ -163,16 +163,16 @@ AC_DEFUN([CURL_CHECK_TYPE_SOCKLEN_T], [
               accept(0,0,&len);
             ])
           ],[
-             curl_cv_socklen_t_equiv_bis="$t"
+             curl_cv_socklen_t_equiv="$t"
              break 2
           ])
         done
       done
     ])
-    if test "x$curl_cv_socklen_t_equiv_bis" = "x"; then
-      AC_MSG_ERROR([Cannot find a type to use in place of socklen_t bis])
+    if test "x$curl_cv_socklen_t_equiv" = "x"; then
+      AC_MSG_ERROR([Cannot find a type to use in place of socklen_t])
     else
-      AC_DEFINE_UNQUOTED(socklen_t_bis, $curl_cv_socklen_t_equiv_bis,
+      AC_DEFINE_UNQUOTED(socklen_t, $curl_cv_socklen_t_equiv,
         [type to use in place of socklen_t if not defined])
     fi
   ],[

diff --git a/configure.ac b/configure.ac
index a0eac1d402f1a0936b3ebf35b85e1ac758c39855..4ab6503b16703b3dc67b5aed7760a8a9b38943b1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1506,7 +1506,8 @@ AC_CHECK_TYPE(ssize_t, ,
 # Experimental check
 CURL_CHECK_TYPE_SOCKLEN_T
 
-TYPE_SOCKLEN_T
+# TYPE_SOCKLEN_T
+
 TYPE_IN_ADDR_T
 
 TYPE_SOCKADDR_STORAGE