Use autoconfig to check for socklen_t ...

2003-12-10  Tambet Ingo  <tambet@ximian.com>

	* configure.in: Use autoconfig to check for socklen_t ...

	* libsoup/soup-address.c: ... and remove it from here ...

	* libsoup/soup-dns.c: ... and here.

diff --git a/ChangeLog b/ChangeLog
index d618cf5..02f1a05 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-12-10  Tambet Ingo  <tambet@ximian.com>
+
+       * configure.in: Use autoconfig to check for socklen_t ...
+
+       * libsoup/soup-address.c: ... and remove it from here ...
+
+       * libsoup/soup-dns.c: ... and here.
+
 2003-12-09  Rodrigo Moya <rodrigo@ximian.com>
 
        * libsoup/soup-soap-message.c (soup_soap_message_persist):

diff --git a/configure.in b/configure.in
index 869b66a..d045489 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -78,6 +78,12 @@ PKG_CHECK_MODULES(XML, libxml-2.0)
 AC_SUBST(XML_CFLAGS)
 AC_SUBST(XML_LIBS)
 
+dnl *******************
+dnl *** Type checks ***
+dnl *******************
+
+AC_CHECK_TYPE(socklen_t, size_t)
+
 dnl *********************************
 dnl *** Networking library checks ***
 dnl *********************************

diff --git a/libsoup/soup-address.c b/libsoup/soup-address.c
index c83b390..1046f72 100644 (file)
--- a/libsoup/soup-address.c
+++ b/libsoup/soup-address.c
@@ -9,6 +9,7 @@
 #include <config.h>
 #endif
 
+#include <unistd.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdlib.h>
@@ -26,11 +27,6 @@
 #include "soup-marshal.h"
 #include "soup-misc.h"
 
-#include <unistd.h>
-#ifndef socklen_t
-#  define socklen_t size_t
-#endif
-
 #ifndef INET_ADDRSTRLEN
 #  define INET_ADDRSTRLEN 16
 #  define INET6_ADDRSTRLEN 46

diff --git a/libsoup/soup-dns.c b/libsoup/soup-dns.c
index 710b9de..a3fed01 100644 (file)
--- a/libsoup/soup-dns.c
+++ b/libsoup/soup-dns.c
@@ -25,10 +25,6 @@
 #include "soup-dns.h"
 #include "soup-misc.h"
 
-#ifndef socklen_t
-#  define socklen_t int
-#endif
-
 #ifndef INET_ADDRSTRLEN
 #  define INET_ADDRSTRLEN 16
 #  define INET6_ADDRSTRLEN 46