<sys/dir.h> is for use as a compatibility interface only. Warn if

included by kernel modules, and also remove use from any modules that
currently attempt to use it.

7 files changed, 37 insertions, 13 deletions

diff --git a/sys/msdosfs/msdosfs_vnops.c b/sys/msdosfs/msdosfs_vnops.c
index 2f37fd4d299..586ab8b5968 100644
--- a/sys/msdosfs/msdosfs_vnops.c
+++ b/sys/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msdosfs_vnops.c,v 1.6 1996/10/04 03:05:32 deraadt Exp $	*/
+/*	$OpenBSD: msdosfs_vnops.c,v 1.7 1996/10/24 17:56:18 tholo Exp $	*/
 /*	$NetBSD: msdosfs_vnops.c,v 1.48 1996/03/20 00:45:43 thorpej Exp $	*/
 
 /*-
@@ -62,7 +62,7 @@
 #include <sys/signalvar.h>
 #include <miscfs/specfs/specdev.h> /* XXX */	/* defines v_rdev */
 #include <sys/malloc.h>
-#include <sys/dir.h>		/* defines dirent structure */
+#include <sys/dirent.h>		/* defines dirent structure */
 #include <sys/lockf.h>
 
 #include <vm/vm.h>
diff --git a/sys/netinet/fil.c b/sys/netinet/fil.c
index 2c0f77c1cba..279e583b9f3 100644
--- a/sys/netinet/fil.c
+++ b/sys/netinet/fil.c
@@ -8,7 +8,7 @@
 #if 0
 #ifndef	lint
 static	char	sccsid[] = "@(#)fil.c	1.36 6/5/96 (C) 1993-1996 Darren Reed";
-static	char	rcsid[] = "$OpenBSD: fil.c,v 1.6 1996/10/08 07:33:24 niklas Exp $";
+static	char	rcsid[] = "$OpenBSD: fil.c,v 1.7 1996/10/24 17:56:20 tholo Exp $";
 #endif
 #endif
 
@@ -25,7 +25,11 @@ static	char	rcsid[] = "$OpenBSD: fil.c,v 1.6 1996/10/08 07:33:24 niklas Exp $";
 #endif
 #include <sys/uio.h>
 #if !defined(__SVR4) && !defined(__svr4__)
-# include <sys/dir.h>
+# if defined(__OpenBSD__)
+#  include <sys/dirent.h>
+# else
+#  include <sys/dir.h>
+# endif
 # include <sys/mbuf.h>
 #else
 # include <sys/byteorder.h>
diff --git a/sys/netinet/ip_fil.c b/sys/netinet/ip_fil.c
index e03aad0bc17..f5b1196725b 100644
--- a/sys/netinet/ip_fil.c
+++ b/sys/netinet/ip_fil.c
@@ -8,7 +8,7 @@
 #if 0
 #ifndef	lint
 static	char	sccsid[] = "@(#)ip_fil.c	2.41 6/5/96 (C) 1993-1995 Darren Reed";
-static	char	rcsid[] = "$OpenBSD: ip_fil.c,v 1.6 1996/10/08 07:33:25 niklas Exp $";
+static	char	rcsid[] = "$OpenBSD: ip_fil.c,v 1.7 1996/10/24 17:56:20 tholo Exp $";
 #endif
 #endif
 
@@ -17,7 +17,11 @@ static	char	rcsid[] = "$OpenBSD: ip_fil.c,v 1.6 1996/10/08 07:33:25 niklas Exp $
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/file.h>
-#include <sys/dir.h>
+#if defined(__OpenBSD__)
+# include <sys/dirent.h>
+#else
+# include <sys/dir.h>
+#endif
 #include <sys/ioctl.h>
 #include <sys/systm.h>
 #include <sys/uio.h>
diff --git a/sys/netinet/ip_frag.c b/sys/netinet/ip_frag.c
index 7c2514781d9..253bd0f861f 100644
--- a/sys/netinet/ip_frag.c
+++ b/sys/netinet/ip_frag.c
@@ -8,7 +8,7 @@
 #if 0
 #ifndef	lint
 static	char	sccsid[] = "@(#)ip_frag.c	1.11 3/24/96 (C) 1993-1995 Darren Reed";
-static	char	rcsid[] = "$OpenBSD: ip_frag.c,v 1.4 1996/10/08 07:33:27 niklas Exp $";
+static	char	rcsid[] = "$OpenBSD: ip_frag.c,v 1.5 1996/10/24 17:56:21 tholo Exp $";
 #endif
 #endif
 
@@ -28,7 +28,11 @@ static	char	rcsid[] = "$OpenBSD: ip_frag.c,v 1.4 1996/10/08 07:33:27 niklas Exp
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #if !defined(__SVR4) && !defined(__svr4__)
-# include <sys/dir.h>
+# if defined(__OpenBSD__)
+#  include <sys/dirent.h>
+# else
+#  include <sys/dir.h>
+# endif
 # include <sys/mbuf.h>
 #else
 # include <sys/byteorder.h>
diff --git a/sys/netinet/ip_nat.c b/sys/netinet/ip_nat.c
index 56709cd0e69..d0c28108994 100644
--- a/sys/netinet/ip_nat.c
+++ b/sys/netinet/ip_nat.c
@@ -24,7 +24,7 @@
 #if 0
 #ifndef	lint
 static	char	sccsid[] = "@(#)ip_nat.c	1.11 6/5/96 (C) 1995 Darren Reed";
-static	char	rcsid[] = "$OpenBSD: ip_nat.c,v 1.5 1996/10/08 07:33:28 niklas Exp $";
+static	char	rcsid[] = "$OpenBSD: ip_nat.c,v 1.6 1996/10/24 17:56:22 tholo Exp $";
 #endif
 #endif
 
@@ -45,7 +45,11 @@ static	char	rcsid[] = "$OpenBSD: ip_nat.c,v 1.5 1996/10/08 07:33:28 niklas Exp $
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #if !defined(__SVR4) && !defined(__svr4__)
-# include <sys/dir.h>
+# if defined(__OpenBSD__)
+#  include <sys/dirent.h>
+# else
+#  include <sys/dir.h>
+# endif
 # include <sys/mbuf.h>
 #else
 # include <sys/byteorder.h>
diff --git a/sys/netinet/ip_state.c b/sys/netinet/ip_state.c
index 52956b8c9e4..f50f6cea73f 100644
--- a/sys/netinet/ip_state.c
+++ b/sys/netinet/ip_state.c
@@ -8,7 +8,7 @@
 #if 0
 #ifndef	lint
 static	char	sccsid[] = "@(#)ip_state.c	1.8 6/5/96 (C) 1993-1995 Darren Reed";
-static	char	rcsid[] = "$OpenBSD: ip_state.c,v 1.4 1996/10/08 07:33:29 niklas Exp $";
+static	char	rcsid[] = "$OpenBSD: ip_state.c,v 1.5 1996/10/24 17:56:21 tholo Exp $";
 #endif
 #endif
 
@@ -29,7 +29,11 @@ static	char	rcsid[] = "$OpenBSD: ip_state.c,v 1.4 1996/10/08 07:33:29 niklas Exp
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #if !defined(__SVR4) && !defined(__svr4__)
-# include <sys/dir.h>
+# if defined(__OpenBSD__)
+#  include <sys/dirent.h>
+# else
+#  include <sys/dir.h>
+# endif
 # include <sys/mbuf.h>
 #else
 # include <sys/byteorder.h>
diff --git a/sys/sys/dir.h b/sys/sys/dir.h
index dff3263c8f7..04b28516e64 100644
--- a/sys/sys/dir.h
+++ b/sys/sys/dir.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dir.h,v 1.2 1996/03/03 12:11:31 niklas Exp $	*/
+/*	$OpenBSD: dir.h,v 1.3 1996/10/24 17:56:17 tholo Exp $	*/
 /*	$NetBSD: dir.h,v 1.8 1994/06/29 06:43:52 cgd Exp $	*/
 
 /*
@@ -44,6 +44,10 @@
 #ifndef _SYS_DIR_H_
 #define	_SYS_DIR_H_
 
+#ifdef _KERNEL
+#warning "<sys/dir.h> is a compatibility interface only, and should not be used"
+#endif
+
 #include <dirent.h>
 
 /*