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.75.4.3
retrieving revision 1.78.4.1
diff -u -p -r1.75.4.3 -r1.78.4.1
--- src/sys/sys/socket.h	2007/02/26 09:12:15	1.75.4.3
+++ src/sys/sys/socket.h	2006/06/01 22:39:27	1.78.4.1
@@ -1,4 +1,4 @@
-/*	$NetBSD: socket.h,v 1.75.4.3 2007/02/26 09:12:15 yamt Exp $	*/
+/*	$NetBSD: socket.h,v 1.78.4.1 2006/06/01 22:39:27 kardel Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -195,9 +195,8 @@ struct	linger {
 #define	pseudo_AF_HDRCMPLT 30		/* Used by BPF to not rewrite hdrs
 					   in interface output routine */
 #endif
-#define AF_BLUETOOTH	31		/* Bluetooth: HCI, SCO, L2CAP, RFCOMM */
 
-#define	AF_MAX		32
+#define	AF_MAX		31
 
 /*
  * Structure used by kernel to store most
@@ -283,7 +282,6 @@ struct sockaddr_storage {
 #if defined(_NETBSD_SOURCE)
 #define PF_KEY 		pseudo_AF_KEY	/* like PF_ROUTE, only for key mgmt */
 #endif
-#define PF_BLUETOOTH	AF_BLUETOOTH
 
 #define	PF_MAX		AF_MAX
 
@@ -558,11 +556,7 @@ ssize_t	sendmsg(int, const struct msghdr
 int	setsockopt(int, int, int, const void *, socklen_t);
 int	shutdown(int, int);
 int	sockatmark(int);
-int	socket(int, int, int)
-#if !defined(__LIBC12_SOURCE__) && !defined(_STANDALONE)
-__RENAME(__socket30)
-#endif
-			     ;
+int	socket(int, int, int);
 int	socketpair(int, int, int, int *);
 __END_DECLS
 #endif /* !_KERNEL */