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

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

details:   https://anonhg.NetBSD.org/src/rev/0f4fa65d83d1
branches:  netbsd-2
changeset: 564417:0f4fa65d83d1
user:      tron <tron%NetBSD.org@localhost>
date:      Mon Jan 30 14:48:18 2006 +0000

description:
Pull up following revision(s) (requested by kleink in ticket #10233):
        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 7f0e9d5be84d -r 0f4fa65d83d1 sys/sys/socket.h
--- a/sys/sys/socket.h  Fri Jan 27 22:20:18 2006 +0000
+++ b/sys/sys/socket.h  Mon Jan 30 14:48:18 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: socket.h,v 1.68 2003/08/07 16:34:14 agc Exp $  */
+/*     $NetBSD: socket.h,v 1.68.4.1 2006/01/30 14:48:18 tron Exp $     */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -452,7 +452,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)))
 
@@ -463,7 +463,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))