5 files changed, 23 insertions, 4 deletions

diff --git a/include/netdb.h b/include/netdb.h
index 7d43899ae6d0..f51dc2694879 100644
--- a/include/netdb.h
+++ b/include/netdb.h
@@ -61,8 +61,13 @@
 #ifndef _NETDB_H_
 #define _NETDB_H_
 
+#include <machine/ansi.h>
 #include <sys/cdefs.h>
-#include <sys/types.h>
+
+#ifdef	_BSD_SIZE_T_
+typedef	_BSD_SIZE_T_	size_t;
+#undef	_BSD_SIZE_T_
+#endif
 
 #ifndef _PATH_HEQUIV
 # define	_PATH_HEQUIV	"/etc/hosts.equiv"
@@ -192,6 +197,14 @@ struct addrinfo {
  */
 #define	SCOPE_DELIMITER	'%'
 
+/*
+ * data types - basically forward decl for getnameinfo()
+ */
+#ifdef	_BSD_SOCKLEN_T_
+typedef	_BSD_SOCKLEN_T_	socklen_t;
+#undef	_BSD_SOCKLEN_T_
+#endif
+
 __BEGIN_DECLS
 void		endhostent __P((void));
 void		endnetent __P((void));
@@ -221,7 +234,7 @@ void		setnetent __P((int));
 void		setprotoent __P((int));
 int		getaddrinfo __P((const char *, const char *,
 				 const struct addrinfo *, struct addrinfo **));
-int		getnameinfo __P((const struct sockaddr *, size_t, char *,
+int		getnameinfo __P((const struct sockaddr *, socklen_t, char *,
 				 size_t, char *, size_t, int));
 void		freeaddrinfo __P((struct addrinfo *));
 char		*gai_strerror __P((int));
diff --git a/lib/libc/net/getnameinfo.c b/lib/libc/net/getnameinfo.c
index 5bf2192b82e7..06d4d0037caa 100644
--- a/lib/libc/net/getnameinfo.c
+++ b/lib/libc/net/getnameinfo.c
@@ -98,7 +98,7 @@ static int ip6_sa2str __P((const struct sockaddr_in6 *, char *, size_t, int));
 int
 getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
 	const struct sockaddr *sa;
-	size_t salen;
+	socklen_t salen;
 	char *host;
 	size_t hostlen;
 	char *serv;
diff --git a/sys/alpha/include/ansi.h b/sys/alpha/include/ansi.h
index 806f859cacd0..152c69c27668 100644
--- a/sys/alpha/include/ansi.h
+++ b/sys/alpha/include/ansi.h
@@ -51,6 +51,7 @@
 #define	_BSD_CLOCKID_T_		int		/* clockid_t */
 #define	_BSD_PTRDIFF_T_		long		/* ptr1 - ptr2 */
 #define	_BSD_SIZE_T_		unsigned long	/* sizeof() */
+#define	_BSD_SOCKLEN_T_		__uint32_t
 #define	_BSD_SSIZE_T_		long		/* byte count or error */
 #define	_BSD_TIME_T_		int		/* time() */
 #define	_BSD_TIMER_T_		int		/* timer_t */
diff --git a/sys/i386/include/ansi.h b/sys/i386/include/ansi.h
index 65ab84fff757..057f1fa5023c 100644
--- a/sys/i386/include/ansi.h
+++ b/sys/i386/include/ansi.h
@@ -51,6 +51,7 @@
 #define	_BSD_PTRDIFF_T_	int			/* ptr1 - ptr2 */
 #define	_BSD_RUNE_T_	_BSD_CT_RUNE_T_		/* rune_t (see below) */
 #define	_BSD_SIZE_T_	unsigned int		/* sizeof() */
+#define	_BSD_SOCKLEN_T_	__uint32_t
 #define	_BSD_SSIZE_T_	int			/* byte count or error */
 #define	_BSD_TIME_T_	long			/* time()... */
 #define	_BSD_TIMER_T_	int			/* timer_gettime()... */
diff --git a/sys/sys/socket.h b/sys/sys/socket.h
index a489456ecc22..1239a0554377 100644
--- a/sys/sys/socket.h
+++ b/sys/sys/socket.h
@@ -37,6 +37,7 @@
 #ifndef _SYS_SOCKET_H_
 #define	_SYS_SOCKET_H_
 
+#include <machine/ansi.h>
 #define _NO_NAMESPACE_POLLUTION
 #include <machine/param.h>
 #undef _NO_NAMESPACE_POLLUTION
@@ -49,7 +50,10 @@
  * Data types.
  */
 typedef u_char		sa_family_t;
-typedef u_int32_t	socklen_t;
+#ifdef	_BSD_SOCKLEN_T_
+typedef	_BSD_SOCKLEN_T_	socklen_t;
+#undef	_BSD_SOCKLEN_T_
+#endif
  
 /*
  * Types