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.68.4.1
retrieving revision 1.69
diff -u -p -r1.68.4.1 -r1.69
--- src/sys/sys/socket.h	2006/01/30 14:48:18	1.68.4.1
+++ src/sys/sys/socket.h	2004/09/03 18:14:09	1.69
@@ -1,4 +1,4 @@
-/*	$NetBSD: socket.h,v 1.68.4.1 2006/01/30 14:48:18 tron Exp $	*/
+/*	$NetBSD: socket.h,v 1.69 2004/09/03 18:14:09 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -133,6 +133,7 @@ typedef	_BSD_SSIZE_T_	ssize_t;
 #define SO_RCVTIMEO	0x1006		/* receive timeout */
 #define	SO_ERROR	0x1007		/* get error status and clear */
 #define	SO_TYPE		0x1008		/* get socket type */
+#define	SO_OVERFLOWED	0x1009		/* datagrams: return packets dropped */
 
 /*
  * Structure used for manipulating linger option.
@@ -452,7 +453,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)))
 
@@ -463,7 +464,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))