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.84.2.4
retrieving revision 1.85
diff -u -p -r1.84.2.4 -r1.85
--- src/sys/sys/socket.h	2007/10/09 13:45:11	1.84.2.4
+++ src/sys/sys/socket.h	2007/05/02 20:40:29	1.85
@@ -1,4 +1,4 @@
-/*	$NetBSD: socket.h,v 1.84.2.4 2007/10/09 13:45:11 ad Exp $	*/
+/*	$NetBSD: socket.h,v 1.85 2007/05/02 20:40:29 dyoung Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -136,10 +136,6 @@ typedef	_BSD_SSIZE_T_	ssize_t;
 #define	SO_TYPE		0x1008		/* get socket type */
 #define	SO_OVERFLOWED	0x1009		/* datagrams: return packets dropped */
 
-#define	SO_NOHEADER	0x100a		/* user supplies no header to kernel;
-					 * kernel removes header and supplies
-					 * payload
-					 */
 /*
  * Structure used for manipulating linger option.
  */
@@ -242,8 +238,6 @@ struct sockaddr_storage {
 	__int64_t     __ss_align;/* force desired structure storage alignment */
 	char		__ss_pad2[_SS_PAD2SIZE];
 };
-#define	sstosa(__ss)	((struct sockaddr *)(__ss))
-#define	sstocsa(__ss)	((const struct sockaddr *)(__ss))
 #endif /* _XOPEN_SOURCE >= 500 || _NETBSD_SOURCE */
 #endif /* 1 */
 
@@ -468,13 +462,6 @@ struct msghdr {
 #define	MSG_MCAST	0x0200		/* this message was rcvd using link-level mcast */
 #define	MSG_NOSIGNAL	0x0400		/* do not generate SIGPIPE on EOF */
 
-/* Extra flags used internally only */
-#define	MSG_USERFLAGS	0x0ffffff
-#define MSG_NAMEMBUF	0x1000000	/* msg_name is an mbuf */
-#define MSG_CONTROLMBUF	0x2000000	/* msg_control is an mbuf */
-#define MSG_IOVUSRSPACE	0x4000000	/* msg_iov is in user space */
-#define MSG_LENUSRSPACE	0x8000000	/* address length is in user space */
-
 /*
  * Header for ancillary data objects in msg_control buffer.
  * Used for additional information with/about a datagram
@@ -551,20 +538,9 @@ int	__cmsg_alignbytes(void);
 __END_DECLS
 
 #ifdef	_KERNEL
-static inline socklen_t
-sockaddr_getlen(const struct sockaddr *sa)
-{
-	return sa->sa_len;
-}
-
 __BEGIN_DECLS
-struct sockaddr *sockaddr_copy(struct sockaddr *, socklen_t,
-    const struct sockaddr *);
-struct sockaddr *sockaddr_alloc(sa_family_t, socklen_t, int);
-const void *sockaddr_const_addr(const struct sockaddr *, socklen_t *);
-void *sockaddr_addr(struct sockaddr *, socklen_t *);
-const struct sockaddr *sockaddr_any(const struct sockaddr *);
-const void *sockaddr_anyaddr(const struct sockaddr *, socklen_t *);
+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 *);