Since there is no proof of the existence of a platform which would

justify checking for socklen_t in more than one function, the code
used to find a valid socklen_t replacement is simplified back. The
only function that will be used to find a socklen_t replacement is
getpeername, as it has been since revision 1.4 of curl/acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index 1418ce739747444a2514c6102802bfc4038702ec..cfa734b11586151f4eabb186b4052b8d2e13216b 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -152,15 +152,9 @@ AC_DEFUN([CURL_CHECK_TYPE_SOCKLEN_T], [
 #endif
 #endif
               int getpeername (int, $arg2 *, $t *);
-              int getsockname (int, $arg2 *, $t *);
-              int bind   (int, $arg2 *, $t);
-              int accept (int, $arg2 *, $t *);
             ],[
               $t len=0;
               getpeername(0,0,&len);
-              getsockname(0,0,&len);
-              bind(0,0,len);
-              accept(0,0,&len);
             ])
           ],[
              curl_cv_socklen_t_equiv="$t"

diff --git a/ares/acinclude.m4 b/ares/acinclude.m4
index 6d1835ecb11ea5d288ddd0401d3ba63455de9c8e..8206a88328e7d9c070dc359e84b1fcc204520d14 100644 (file)
--- a/ares/acinclude.m4
+++ b/ares/acinclude.m4
@@ -152,15 +152,9 @@ AC_DEFUN([CURL_CHECK_TYPE_SOCKLEN_T], [
 #endif
 #endif
               int getpeername (int, $arg2 *, $t *);
-              int getsockname (int, $arg2 *, $t *);
-              int bind   (int, $arg2 *, $t);
-              int accept (int, $arg2 *, $t *);
             ],[
               $t len=0;
               getpeername(0,0,&len);
-              getsockname(0,0,&len);
-              bind(0,0,len);
-              accept(0,0,&len);
             ])
           ],[
              curl_cv_socklen_t_equiv="$t"