Another try at socklen_t: just check for it, and otherwise use int.

[rsync/rsync.git] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index e35b9a7..a1256ae 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -102,8 +102,9 @@ dnl POSIX 1g it is a type of its own, but some platforms use different
 dnl types for the argument to getsockopt, getpeername, etc.  So we
 dnl have to test to find something that will work.
 
 dnl types for the argument to getsockopt, getpeername, etc.  So we
 dnl have to test to find something that will work.
 

-dnl This test originally comes from lftp, by way of Albert Chin at The
-dnl Written Word.  Thanks!
+dnl This is no good, because passing the wrong pointer on C compilers is
+dnl likely to only generate a warning, not an error.  We don't call this at
+dnl the moment.

 
 AC_DEFUN([TYPE_SOCKLEN_T],
 [
 
 AC_DEFUN([TYPE_SOCKLEN_T],
 [


@@ -116,8 +117,8 @@ AC_DEFUN([TYPE_SOCKLEN_T],
          #include <sys/socket.h>
       ],
       [
          #include <sys/socket.h>
       ],
       [

-         socklen_t len;
-         getpeername(0,0,&len);
+        socklen_t len;
+        getpeername(0,0,&len);

       ],
       [
          lftp_cv_socklen_t=yes
       ],
       [
          lftp_cv_socklen_t=yes


@@ -136,13 +137,16 @@ AC_DEFUN([TYPE_SOCKLEN_T],
                #include <sys/socket.h>
             ],
             [
                #include <sys/socket.h>
             ],
             [

-               $t len;
-               getpeername(0,0,&len);
+              $t len;
+              getpeername(0,0,&len);

             ],
             [
                lftp_cv_socklen_t_equiv="$t"
                break
             ],
             [
                lftp_cv_socklen_t_equiv="$t"
                break

-            ])
+            ],
+           [
+               AC_MSG_ERROR([Cannot find a type to use in place of socklen_t])
+           ])

          done
       ])
       AC_MSG_RESULT($lftp_cv_socklen_t_equiv)
          done
       ])
       AC_MSG_RESULT($lftp_cv_socklen_t_equiv)