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.75.2.1
retrieving revision 1.76
diff -u -p -r1.75.2.1 -r1.76
--- src/sys/sys/socket.h	2006/01/30 13:13:55	1.75.2.1
+++ src/sys/sys/socket.h	2005/09/24 15:52:03	1.76
@@ -1,4 +1,4 @@
-/*	$NetBSD: socket.h,v 1.75.2.1 2006/01/30 13:13:55 tron Exp $	*/
+/*	$NetBSD: socket.h,v 1.76 2005/09/24 15:52:03 christos Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -494,7 +494,7 @@ struct cmsghdr {
 	(((__caddr_t)(cmsg) + __CMSG_ALIGN((cmsg)->cmsg_len) + \
 			    __CMSG_ALIGN(sizeof(struct cmsghdr)) > \
 	    (((__caddr_t)(mhdr)->msg_control) + (mhdr)->msg_controllen)) ? \
-	    (struct cmsghdr *)0 : \
+	    (struct cmsghdr *)NULL : \
 	    (struct cmsghdr *)((__caddr_t)(cmsg) + \
 	        __CMSG_ALIGN((cmsg)->cmsg_len)))
 
@@ -505,7 +505,7 @@ struct cmsghdr {
 #define	CMSG_FIRSTHDR(mhdr) \
 	((mhdr)->msg_controllen >= sizeof(struct cmsghdr) ? \
 	 (struct cmsghdr *)(mhdr)->msg_control : \
-	 (struct cmsghdr *)0)
+	 (struct cmsghdr *)NULL)
 
 #define CMSG_SPACE(l)	(__CMSG_ALIGN(sizeof(struct cmsghdr)) + __CMSG_ALIGN(l))
 #define CMSG_LEN(l)	(__CMSG_ALIGN(sizeof(struct cmsghdr)) + (l))
@@ -524,28 +524,6 @@ struct cmsghdr {
 #define	SHUT_WR		1		/* Disallow further sends. */
 #define	SHUT_RDWR	2		/* Disallow further sends/receives. */
 
-#if defined(_NETBSD_SOURCE)
-/*
- * 4.3 compat sockaddr, move to compat file later
- */
-struct osockaddr {
-	__uint16_t	sa_family;	/* address family */
-	char		sa_data[14];	/* up to 14 bytes of direct address */
-};
-
-/*
- * 4.3-compat message header (move to compat file later).
- */
-struct omsghdr {
-	__caddr_t	msg_name;	/* optional address */
-	int		msg_namelen;	/* size of address */
-	struct iovec	*msg_iov;	/* scatter/gather array */
-	int		msg_iovlen;	/* # elements in msg_iov */
-	__caddr_t	msg_accrights;	/* access rights sent/received */
-	int		msg_accrightslen;
-};
-#endif
-
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS