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
rcsdiff: /ftp/cvs/cvsroot/src/sys/sys/socket.h,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.46.2.1
retrieving revision 1.54.2.1
diff -u -p -r1.46.2.1 -r1.54.2.1
--- src/sys/sys/socket.h	2000/11/20 18:11:35	1.46.2.1
+++ src/sys/sys/socket.h	2000/06/22 17:10:27	1.54.2.1
@@ -1,4 +1,4 @@
-/*	$NetBSD: socket.h,v 1.46.2.1 2000/11/20 18:11:35 bouyer Exp $	*/
+/*	$NetBSD: socket.h,v 1.54.2.1 2000/06/22 17:10:27 minoura Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -75,15 +75,9 @@
  * Data types.
  */
 #include <sys/ansi.h>
-
-#ifndef sa_family_t
-typedef __sa_family_t	sa_family_t;
-#define sa_family_t	__sa_family_t
-#endif
-
 #ifndef socklen_t
 typedef __socklen_t	socklen_t;
-#define socklen_t	__socklen_t
+#define socklen_t	socklen_t
 #endif
 
 /*
@@ -189,9 +183,9 @@ struct	linger {
  * addresses.
  */
 struct sockaddr {
-	u_char		sa_len;		/* total length */
-	sa_family_t	sa_family;	/* address family */
-	char		sa_data[14];	/* actually longer; address value */
+	u_char	sa_len;			/* total length */
+	u_char	sa_family;		/* address family */
+	char	sa_data[14];		/* actually longer; address value */
 };
 
 #if defined(_KERNEL)
@@ -217,11 +211,11 @@ struct sockproto {
 
 #if !defined(_XOPEN_SOURCE) || (_XOPEN_SOURCE - 0) >= 500
 struct sockaddr_storage {
-	u_char		ss_len;		/* address length */
-	sa_family_t	ss_family;	/* address family */
-	char		__ss_pad1[_SS_PAD1SIZE];
-	int64_t      __ss_align;/* force desired structure storage alignment */
-	char		__ss_pad2[_SS_PAD2SIZE];
+	u_char	ss_len;		/* address length */
+	u_char	ss_family;	/* address family */
+	char	__ss_pad1[_SS_PAD1SIZE];
+	int64_t	__ss_align;	/* force desired structure storage alignment */
+	char	__ss_pad2[_SS_PAD2SIZE];
 };
 #endif /* !_XOPEN_SOURCE || ... */
 #endif /* 1 */
@@ -407,7 +401,7 @@ struct cmsghdr {
 
 /* given pointer to struct cmsghdr, return pointer to data */
 #define	CMSG_DATA(cmsg) \
-	((u_char *)(void *)(cmsg) + __CMSG_ALIGN(sizeof(struct cmsghdr)))
+	((u_char *)(cmsg) + __CMSG_ALIGN(sizeof(struct cmsghdr)))
 
 /*
  * Alignment requirement for CMSG struct manipulation.
@@ -472,14 +466,12 @@ struct omsghdr {
 };
 #endif
 
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
 int	__cmsg_alignbytes __P((void));
-__END_DECLS
 
 #ifndef	_KERNEL
 
+#include <sys/cdefs.h>
+
 __BEGIN_DECLS
 int	accept __P((int, struct sockaddr *, socklen_t *));
 int	bind __P((int, const struct sockaddr *, socklen_t));