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.77 retrieving revision 1.78 diff -u -p -r1.77 -r1.78 --- src/sys/sys/socket.h 2005/11/29 03:12:16 1.77 +++ src/sys/sys/socket.h 2006/01/28 13:20:18 1.78 @@ -1,4 +1,4 @@ -/* $NetBSD: socket.h,v 1.77 2005/11/29 03:12:16 christos Exp $ */ +/* $NetBSD: socket.h,v 1.78 2006/01/28 13:20:18 kleink Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -497,7 +497,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 *)NULL : \ + (struct cmsghdr *)0 : \ (struct cmsghdr *)((__caddr_t)(cmsg) + \ __CMSG_ALIGN((cmsg)->cmsg_len))) @@ -508,7 +508,7 @@ struct cmsghdr { #define CMSG_FIRSTHDR(mhdr) \ ((mhdr)->msg_controllen >= sizeof(struct cmsghdr) ? \ (struct cmsghdr *)(mhdr)->msg_control : \ - (struct cmsghdr *)NULL) + (struct cmsghdr *)0) #define CMSG_SPACE(l) (__CMSG_ALIGN(sizeof(struct cmsghdr)) + __CMSG_ALIGN(l)) #define CMSG_LEN(l) (__CMSG_ALIGN(sizeof(struct cmsghdr)) + (l))