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 retrieving revision 1.76 diff -u -p -r1.75 -r1.76 --- src/sys/sys/socket.h 2005/03/09 19:02:22 1.75 +++ src/sys/sys/socket.h 2005/09/24 15:52:03 1.76 @@ -1,4 +1,4 @@ -/* $NetBSD: socket.h,v 1.75 2005/03/09 19:02:22 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. @@ -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 __BEGIN_DECLS