[src/netbsd-3]: src/sys/sys Pull up following revision(s) (requested by klein...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/74c3d6f9976e
branches:  netbsd-3
changeset: 577789:74c3d6f9976e
user:      tron <tron%NetBSD.org@localhost>
date:      Mon Jan 30 13:13:55 2006 +0000

description:
Pull up following revision(s) (requested by kleink in ticket #1143):
        sys/sys/socket.h: revision 1.78
Since NULL isn't necessarily available, change CMSG_*() to use the
integer constant expression directly instead.
Fixes a problem in the build of rxvt-unicode-7.2, as reported by
Thomas Klausner.

diffstat:

 sys/sys/socket.h |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 66a241f9bc4c -r 74c3d6f9976e sys/sys/socket.h
--- a/sys/sys/socket.h  Sat Jan 28 10:24:54 2006 +0000
+++ b/sys/sys/socket.h  Mon Jan 30 13:13:55 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: socket.h,v 1.75 2005/03/09 19:02:22 tron Exp $ */
+/*     $NetBSD: socket.h,v 1.75.2.1 2006/01/30 13:13:55 tron Exp $     */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -494,7 +494,7 @@
        (((__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)))
 
@@ -505,7 +505,7 @@
 #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))