Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/sys/socket.h,v
retrieving revision 1.82.10.3
retrieving revision 1.83
diff -u -p -r1.82.10.3 -r1.83
--- src/sys/sys/socket.h	2007/05/07 10:56:14	1.82.10.3
+++ src/sys/sys/socket.h	2007/02/20 19:07:11	1.83
@@ -1,4 +1,4 @@
-/*	$NetBSD: socket.h,v 1.82.10.3 2007/05/07 10:56:14 yamt Exp $	*/
+/*	$NetBSD: socket.h,v 1.83 2007/02/20 19:07:11 plunky Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -498,11 +498,11 @@ struct cmsghdr {
 
 /* given pointer to struct cmsghdr, return pointer to next cmsghdr */
 #define	CMSG_NXTHDR(mhdr, cmsg)	\
-	(((char *)(cmsg) + __CMSG_ALIGN((cmsg)->cmsg_len) + \
+	(((__caddr_t)(cmsg) + __CMSG_ALIGN((cmsg)->cmsg_len) + \
 			    __CMSG_ALIGN(sizeof(struct cmsghdr)) > \
-	    (((char *)(mhdr)->msg_control) + (mhdr)->msg_controllen)) ? \
+	    (((__caddr_t)(mhdr)->msg_control) + (mhdr)->msg_controllen)) ? \
 	    (struct cmsghdr *)0 : \
-	    (struct cmsghdr *)((char *)(cmsg) + \
+	    (struct cmsghdr *)((__caddr_t)(cmsg) + \
 	        __CMSG_ALIGN((cmsg)->cmsg_len)))
 
 /*
@@ -537,16 +537,6 @@ __BEGIN_DECLS
 int	__cmsg_alignbytes(void);
 __END_DECLS
 
-#ifdef	_KERNEL
-__BEGIN_DECLS
-struct sockaddr *sockaddr_copy(struct sockaddr *, const struct sockaddr *);
-struct sockaddr *sockaddr_alloc(sa_family_t, int);
-int sockaddr_cmp(const struct sockaddr *, const struct sockaddr *);
-struct sockaddr *sockaddr_dup(const struct sockaddr *, int);
-void sockaddr_free(struct sockaddr *);
-__END_DECLS
-#endif /* _KERNEL */
-
 #ifndef	_KERNEL
 
 __BEGIN_DECLS
@@ -555,10 +545,10 @@ int	bind(int, const struct sockaddr *, s
 int	connect(int, const struct sockaddr *, socklen_t);
 int	getpeername(int, struct sockaddr * __restrict, socklen_t * __restrict);
 int	getsockname(int, struct sockaddr * __restrict, socklen_t * __restrict);
-int	getsockopt(int, int, int, void *__restrict, socklen_t * __restrict);
+int	getsockopt(int, int, int, void * __restrict, socklen_t * __restrict);
 int	listen(int, int);
 ssize_t	recv(int, void *, size_t, int);
-ssize_t	recvfrom(int, void *__restrict, size_t, int,
+ssize_t	recvfrom(int, void * __restrict, size_t, int,
 	    struct sockaddr * __restrict, socklen_t * __restrict);
 ssize_t	recvmsg(int, struct msghdr *, int);
 ssize_t	send(int, const void *, size_t, int);