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.54
retrieving revision 1.55.2.2
diff -u -p -r1.54 -r1.55.2.2
--- src/sys/sys/socket.h	2000/04/03 11:49:25	1.54
+++ src/sys/sys/socket.h	2001/05/01 10:29:06	1.55.2.2
@@ -1,4 +1,4 @@
-/*	$NetBSD: socket.h,v 1.54 2000/04/03 11:49:25 augustss Exp $	*/
+/*	$NetBSD: socket.h,v 1.55.2.2 2001/05/01 10:29:06 he Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -74,7 +74,11 @@
 /*
  * Data types.
  */
-typedef	unsigned int	socklen_t;
+#include <sys/ansi.h>
+#ifndef socklen_t
+typedef __socklen_t	socklen_t;
+#define socklen_t	__socklen_t
+#endif
 
 /*
  * Socket types.
@@ -462,12 +466,14 @@ 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));