Improve the getsockname() arg determination

bk: 452ece21JWCi55vL1PT1TJZYIdC_-g

diff --git a/configure.ac b/configure.ac
index 3f1f82498428a54f5b07dbb08268f18479db12c5..10e96021633ecb44df8fdb9908868d7947b9c5ca 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1010,18 +1010,22 @@ no)
 esac
 
 AC_MSG_CHECKING([type of socklen arg for getsockname()])
-AC_CACHE_VAL(ac_cv_func_getsockname_socklen_type,dnl
-[for ac_cv_func_getsockname_socklen_type in 'socklen_t' 'size_t' 'unsigned int' 'int'; do
-  AC_TRY_COMPILE(dnl
+AC_CACHE_VAL(ac_cv_func_getsockname_arg2,dnl
+[AC_CACHE_VAL(ac_cv_func_getsockname_socklen_type,dnl
+ [for ac_cv_func_getsockname_arg2 in 'struct sockaddr *' 'void *'; do
+  for ac_cv_func_getsockname_socklen_type in 'socklen_t' 'size_t' 'unsigned int' 'int'; do
+   AC_TRY_COMPILE(dnl
 [#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
-extern getsockname (int, struct sockaddr *, $ac_cv_func_getsockname_socklen_type *);],,dnl
-  [ac_not_found=no ; break], ac_not_found=yes)
- done
+extern getsockname (int, $ac_cv_func_getsockname_arg2, $ac_cv_func_getsockname_socklen_type *);],,dnl
+    [ac_not_found=no ; break 2], ac_not_found=yes)
+   done
+  done
+ ])dnl AC_CACHE_VAL
 ])dnl AC_CACHE_VAL
 if test "$ac_not_found" = yes; then
  ac_cv_func_getsockname_socklen_type='socklen_t'