From 9e4a59de89bec2fd72c1f9146a135c4aa9fbd1ef Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Thu, 14 May 2009 13:52:38 +0200
Subject: [PATCH] ipfilter(8): Include <sys/dirent.h> instead of <sys/dir.h>.

---
 contrib/ipfilter/ip_lfil.c       | 2 +-
 contrib/ipfilter/ipmon.c         | 2 +-
 contrib/ipfilter/ipsd/ipsdr.c    | 2 +-
 contrib/ipfilter/ipsd/sbpf.c     | 2 +-
 contrib/ipfilter/ipsd/slinux.c   | 2 +-
 contrib/ipfilter/ipsd/snit.c     | 2 +-
 contrib/ipfilter/ipsend/lsock.c  | 2 +-
 contrib/ipfilter/ipsend/sbpf.c   | 2 +-
 contrib/ipfilter/ipsend/slinux.c | 2 +-
 contrib/ipfilter/ipsend/snit.c   | 2 +-
 contrib/ipfilter/ipsend/sock.c   | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/contrib/ipfilter/ip_lfil.c b/contrib/ipfilter/ip_lfil.c
index 196d64e0fe..a1fad99a47 100644
--- a/contrib/ipfilter/ip_lfil.c
+++ b/contrib/ipfilter/ip_lfil.c
@@ -16,7 +16,7 @@ static const char rcsid[] = "@(#)$Id: ip_lfil.c,v 2.6.2.5 2002/10/03 13:47:19 da
 #include <sys/file.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
-#include <sys/dir.h>
+#include <sys/dirent.h>
 #include <sys/socket.h>
 #ifndef	_KERNEL
 # include <stdio.h>
diff --git a/contrib/ipfilter/ipmon.c b/contrib/ipfilter/ipmon.c
index f7e2865430..aa5cf67fa9 100644
--- a/contrib/ipfilter/ipmon.c
+++ b/contrib/ipfilter/ipmon.c
@@ -29,7 +29,7 @@
 # if (__FreeBSD_version >= 300000)
 #  include <sys/dirent.h>
 # else
-#  include <sys/dir.h>
+#  include <sys/dirent.h>
 # endif
 #else
 # include <sys/filio.h>
diff --git a/contrib/ipfilter/ipsd/ipsdr.c b/contrib/ipfilter/ipsd/ipsdr.c
index 298f655944..6a6b6eeaf5 100644
--- a/contrib/ipfilter/ipsd/ipsdr.c
+++ b/contrib/ipfilter/ipsd/ipsdr.c
@@ -13,7 +13,7 @@
 #include <malloc.h>
 #include <netdb.h>
 #include <string.h>
-#include <sys/dir.h>
+#include <sys/dirent.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/socket.h>
diff --git a/contrib/ipfilter/ipsd/sbpf.c b/contrib/ipfilter/ipsd/sbpf.c
index 97bb4ce0ff..465ed6c324 100644
--- a/contrib/ipfilter/ipsd/sbpf.c
+++ b/contrib/ipfilter/ipsd/sbpf.c
@@ -20,7 +20,7 @@
 #if BSD < 199103
 #include <sys/fcntlcom.h>
 #endif
-#include <sys/dir.h>
+#include <sys/dirent.h>
 #include <net/bpf.h>
 
 #include <net/if.h>
diff --git a/contrib/ipfilter/ipsd/slinux.c b/contrib/ipfilter/ipsd/slinux.c
index 2c5aa97d2e..af6cf5b0d8 100644
--- a/contrib/ipfilter/ipsd/slinux.c
+++ b/contrib/ipfilter/ipsd/slinux.c
@@ -19,7 +19,7 @@
 #include <sys/socket.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
-#include <sys/dir.h>
+#include <sys/dirent.h>
 #include <linux/netdevice.h>
 #include <net/if.h>
 #include <netinet/in.h>
diff --git a/contrib/ipfilter/ipsd/snit.c b/contrib/ipfilter/ipsd/snit.c
index ec7178f1f8..eb7e65e6cc 100644
--- a/contrib/ipfilter/ipsd/snit.c
+++ b/contrib/ipfilter/ipsd/snit.c
@@ -21,7 +21,7 @@
 #include <sys/ioctl.h>
 #include <net/nit.h>
 #include <sys/fcntlcom.h>
-#include <sys/dir.h>
+#include <sys/dirent.h>
 #include <net/nit_if.h>
 #include <net/nit_pf.h>
 #include <net/nit_buf.h>
diff --git a/contrib/ipfilter/ipsend/lsock.c b/contrib/ipfilter/ipsend/lsock.c
index 23a762114f..1f2162cc35 100644
--- a/contrib/ipfilter/ipsend/lsock.c
+++ b/contrib/ipfilter/ipsend/lsock.c
@@ -21,7 +21,7 @@ static const char rcsid[] = "@(#)$Id: lsock.c,v 2.1.4.3 2002/12/06 11:40:36 darr
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <sys/dir.h>
+#include <sys/dirent.h>
 #define	__KERNEL__
 #if LINUX >= 0200
 # undef UINT_MAX
diff --git a/contrib/ipfilter/ipsend/sbpf.c b/contrib/ipfilter/ipsend/sbpf.c
index 276ca07ca7..7e4c9116cc 100644
--- a/contrib/ipfilter/ipsend/sbpf.c
+++ b/contrib/ipfilter/ipsend/sbpf.c
@@ -27,7 +27,7 @@
 #if (__FreeBSD_version >= 300000)
 # include <sys/dirent.h>
 #else
-# include <sys/dir.h>
+# include <sys/dirent.h>
 #endif
 #include <net/bpf.h>
 
diff --git a/contrib/ipfilter/ipsend/slinux.c b/contrib/ipfilter/ipsend/slinux.c
index 7438d1c25c..e4308aa622 100644
--- a/contrib/ipfilter/ipsend/slinux.c
+++ b/contrib/ipfilter/ipsend/slinux.c
@@ -16,7 +16,7 @@
 #include <sys/socket.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
-#include <sys/dir.h>
+#include <sys/dirent.h>
 #include <linux/netdevice.h>
 #include <net/if.h>
 #include <netinet/in.h>
diff --git a/contrib/ipfilter/ipsend/snit.c b/contrib/ipfilter/ipsend/snit.c
index 6f2c66269e..5e60522b62 100644
--- a/contrib/ipfilter/ipsend/snit.c
+++ b/contrib/ipfilter/ipsend/snit.c
@@ -17,7 +17,7 @@
 #include <sys/ioctl.h>
 #include <net/nit.h>
 #include <sys/fcntlcom.h>
-#include <sys/dir.h>
+#include <sys/dirent.h>
 #include <net/nit_if.h>
 #include <net/nit_pf.h>
 #include <net/nit_buf.h>
diff --git a/contrib/ipfilter/ipsend/sock.c b/contrib/ipfilter/ipsend/sock.c
index 4d72d8726a..313f36a7ab 100644
--- a/contrib/ipfilter/ipsend/sock.c
+++ b/contrib/ipfilter/ipsend/sock.c
@@ -24,7 +24,7 @@
 #if (__FreeBSD_version >= 300000)
 # include <sys/dirent.h>
 #else
-# include <sys/dir.h>
+# include <sys/dirent.h>
 #endif
 #define _KERNEL
 #define	KERNEL
-- 
2.41.0