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.43.4.2
retrieving revision 1.44
diff -u -p -r1.43.4.2 -r1.44
--- src/sys/sys/socket.h	1999/08/02 22:56:00	1.43.4.2
+++ src/sys/sys/socket.h	1999/07/01 08:13:00	1.44
@@ -1,4 +1,4 @@
-/*	$NetBSD: socket.h,v 1.43.4.2 1999/08/02 22:56:00 thorpej Exp $	*/
+/*	$NetBSD: socket.h,v 1.44 1999/07/01 08:13:00 itojun Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -205,7 +205,6 @@ struct sockproto {
 #define _SS_PAD2SIZE	(_SS_MAXSIZE - sizeof(u_char) * 2 - \
 				_SS_PAD1SIZE - _SS_ALIGNSIZE)
 
-#if !defined(_XOPEN_SOURCE) || (_XOPEN_SOURCE - 0) >= 500
 struct sockaddr_storage {
 	u_char	__ss_len;	/* address length */
 	u_char	__ss_family;	/* address family */
@@ -213,8 +212,7 @@ struct sockaddr_storage {
 	int64_t	__ss_align;	/* force desired structure storage alignment */
 	char	__ss_pad2[_SS_PAD2SIZE];
 };
-#endif /* !_XOPEN_SOURCE || ... */
-#endif /* 1 */
+#endif
 
 /*
  * Protocol families, same as address families for now.
@@ -407,7 +405,7 @@ struct cmsghdr {
 /* given pointer to struct cmsghdr, return pointer to next cmsghdr */
 #define	CMSG_NXTHDR(mhdr, cmsg)	\
 	(((caddr_t)(cmsg) + (cmsg)->cmsg_len + sizeof(struct cmsghdr) > \
-	    (((caddr_t)(mhdr)->msg_control) + (mhdr)->msg_controllen)) ? \
+	    (caddr_t) ((mhdr)->msg_control + (mhdr)->msg_controllen)) ? \
 	    (struct cmsghdr *)NULL : \
 	    (struct cmsghdr *)((caddr_t)(cmsg) + CMSG_ALIGN((cmsg)->cmsg_len)))
 
@@ -482,7 +480,11 @@ __END_DECLS
 #define MSG_COMPAT	0x8000
 #endif
 
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
 void	pfctlinput __P((int, struct sockaddr *));
+__END_DECLS
 #endif /* !_KERNEL */
 
 #endif /* !_SYS_SOCKET_H_ */