--- python/dist/src/configure.in.old	2003-05-03 14:20:48.000000000 -0700
+++ python/dist/src/configure.in	2003-05-04 14:02:56.609360073 -0700
@@ -2692,16 +2731,51 @@
   AC_MSG_RESULT(no)
 fi
 
-AC_CHECK_TYPE(socklen_t,,
-  AC_DEFINE(socklen_t,int,
-            Define to `int' if <sys/socket.h> does not define.),[
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-])
+case $ac_sys_system in
+	SCO_SV*) cat >confdefs2.h <<_EOF
+#undef _XOPEN_SOURCE
+_EOF
+	;;
+	*) echo >confdefs2.h ;;
+esac
+dnl Check for socklen_t: historically on BSD it is an int, and in
+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.
+AC_CHECK_TYPE([socklen_t], ,[
+   AC_MSG_CHECKING([for socklen_t equivalent])
+   AC_CACHE_VAL([curl_cv_socklen_t_equiv],
+   [
+	 # Systems have either "struct sockaddr *" or
+	 # "void *" as the second argument to getpeername
+	 curl_cv_socklen_t_equiv=
+	 for arg2 in "struct sockaddr" void; do
+	  for t in int size_t unsigned long "unsigned long"; do
+	     AC_TRY_COMPILE([
+		#include "confdefs2.h"
+		#include <sys/types.h>
+		#include <sys/socket.h>
+
+		int getpeername (int, $arg2 *, $t *);
+	     ],[
+		$t len;
+		getpeername(0,0,&len);
+	     ],[
+		curl_cv_socklen_t_equiv="$t"
+		break
+	     ])
+	  done
+	 done
+
+	 if test "x$curl_cv_socklen_t_equiv" = x; then
+	  AC_MSG_ERROR([Cannot find a type to use in place of socklen_t])
+	 fi
+      ])
+      AC_MSG_RESULT($curl_cv_socklen_t_equiv)
+      AC_DEFINE_UNQUOTED(socklen_t, $curl_cv_socklen_t_equiv,
+			[type to use in place of socklen_t if not defined])],
+      [#include <sys/types.h>
+#include <sys/socket.h>])
 
 AC_SUBST(THREADHEADERS)
 
--- python/dist/src/Modules/socketmodule.c.old	2003-05-03 14:15:35.020480001 -0700
+++ python/dist/src/Modules/socketmodule.c	2003-05-04 13:21:43.059520070 -0700
@@ -746,7 +746,7 @@
    size numbers). */
 
 static PyObject *
-makeipaddr(struct sockaddr *addr, int addrlen)
+makeipaddr(struct sockaddr *addr, socklen_t addrlen)
 {
 	char buf[NI_MAXHOST];
 	int error;
@@ -768,7 +768,7 @@
 
 /*ARGSUSED*/
 static PyObject *
-makesockaddr(int sockfd, struct sockaddr *addr, int addrlen)
+makesockaddr(int sockfd, struct sockaddr *addr, socklen_t addrlen)
 {
 	if (addrlen == 0) {
 		/* No address -- may be recvfrom() from known socket */
@@ -866,7 +866,7 @@
 
 static int
 getsockaddrarg(PySocketSockObject *s, PyObject *args,
-	       struct sockaddr **addr_ret, int *len_ret)
+	       struct sockaddr **addr_ret, socklen_t *len_ret)
 {
 	switch (s->sock_family) {
 
@@ -1314,7 +1314,7 @@
 sock_bind(PySocketSockObject *s, PyObject *addro)
 {
 	struct sockaddr *addr;
-	int addrlen;
+	socklen_t addrlen;
 	int res;
 
 	if (!getsockaddrarg(s, addro, &addr, &addrlen))
@@ -1361,7 +1361,7 @@
 Close the socket.  It cannot be used after this call.");
 
 static int
-internal_connect(PySocketSockObject *s, struct sockaddr *addr, int addrlen)
+internal_connect(PySocketSockObject *s, struct sockaddr *addr, socklen_t addrlen)
 {
 	int res;
 
@@ -1415,7 +1415,7 @@
 sock_connect(PySocketSockObject *s, PyObject *addro)
 {
 	struct sockaddr *addr;
-	int addrlen;
+	socklen_t addrlen;
 	int res;
 
 	if (!getsockaddrarg(s, addro, &addr, &addrlen))
@@ -1444,7 +1444,7 @@
 sock_connect_ex(PySocketSockObject *s, PyObject *addro)
 {
 	struct sockaddr *addr;
-	int addrlen;
+	socklen_t addrlen;
 	int res;
 
 	if (!getsockaddrarg(s, addro, &addr, &addrlen))
@@ -1918,7 +1918,8 @@
 	PyObject *addro;
 	char *buf;
 	struct sockaddr *addr;
-	int addrlen, len, n, flags;
+	socklen_t addrlen;
+	int len, n, flags;
 
 	flags = 0;
 	if (!PyArg_ParseTuple(args, "s#O:sendto", &buf, &len, &addro)) {