From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Fri, 7 May 2010 08:11:15 +0000 (+0200)
Subject: Do not use macro WGET_SOCKLEN_T.
X-Git-Tag: v1.13~180
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=a8de649f28caf557b29bc0be55b02cabb119096d

Do not use macro WGET_SOCKLEN_T.
---

diff --git a/ChangeLog b/ChangeLog
index 1abc1daf..a9a45e1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-07  Giuseppe Scrivano  <gscrivano@gnu.org>
+
+	* configure.ac: Don't call macro WGET_SOCKLEN_T.
+
+	* m4/wget.m4 (WGET_SOCKLEN_T): Remove macro.
+
 2010-05-07  Giuseppe Scrivano  <gscrivano@gnu.org>
 
 	* configure.ac (ALL_LINGUAS): Remove.
diff --git a/configure.ac b/configure.ac
index f5b776c3..4eb42d26 100644
--- a/configure.ac
+++ b/configure.ac
@@ -223,7 +223,6 @@ dnl
 dnl Call Wget-specific macros defined in aclocal.
 dnl
 WGET_STRUCT_UTIMBUF
-WGET_SOCKLEN_T
 WGET_FNMATCH
 WGET_NANOSLEEP
 WGET_POSIX_CLOCK
diff --git a/m4/wget.m4 b/m4/wget.m4
index f6232813..e06eab4f 100644
--- a/m4/wget.m4
+++ b/m4/wget.m4
@@ -42,36 +42,6 @@ AC_DEFUN([WGET_STRUCT_UTIMBUF], [
   ])
 ])
 
-
-dnl Check for socklen_t.  The third argument of accept, getsockname,
-dnl etc. is int * on some systems, but size_t * on others.  POSIX
-dnl finally standardized on socklen_t, but older systems don't have
-dnl it.  If socklen_t exists, we use it, else if accept() accepts
-dnl size_t *, we use that, else we use int.
-
-AC_DEFUN([WGET_SOCKLEN_T], [
-  AC_MSG_CHECKING(for socklen_t)
-  AC_COMPILE_IFELSE([
-#include <sys/types.h>
-#include <sys/socket.h>
-socklen_t x;
-  ], [AC_MSG_RESULT(socklen_t)], [
-    AC_COMPILE_IFELSE([
-#include <sys/types.h>
-#include <sys/socket.h>
-int accept (int, struct sockaddr *, size_t *);
-    ], [
-      AC_MSG_RESULT(size_t)
-      AC_DEFINE([socklen_t], [size_t],
-                [Define to int or size_t on systems without socklen_t.])
-    ], [
-      AC_MSG_RESULT(int)
-      AC_DEFINE([socklen_t], [int],
-                [Define to int or size_t on systems without socklen_t.])
-    ])
-  ])
-])
-
 dnl Check whether fnmatch.h can be included.  This doesn't use
 dnl AC_FUNC_FNMATCH because Wget is already careful to only use
 dnl fnmatch on certain OS'es.  However, fnmatch.h is sometimes broken