[Midnightbsd-cvs] src: ipfilter/netinet: work in progress..

[laffer1 at midnightbsd.org]

Log Message:
-----------
work in progress.. add __MidnightBSD__ checks in the code

Modified Files:
--------------
    src/sys/contrib/ipfilter/netinet:
        ip_sync.c (r1.2 -> r1.3)
        mlfk_ipl.c (r1.2 -> r1.3)

-------------- next part --------------
Index: mlfk_ipl.c
===================================================================
RCS file: /home/cvs/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -L sys/contrib/ipfilter/netinet/mlfk_ipl.c -L sys/contrib/ipfilter/netinet/mlfk_ipl.c -u -r1.2 -r1.3
--- sys/contrib/ipfilter/netinet/mlfk_ipl.c
+++ sys/contrib/ipfilter/netinet/mlfk_ipl.c
@@ -16,7 +16,7 @@
 #include <sys/socket.h>
 #include <sys/sysctl.h>
 #include <sys/select.h>
-#if __FreeBSD_version >= 500000
+#if __FreeBSD_version >= 500000 || defined(__MidnightBSD__)
 # include <sys/selinfo.h>
 #endif                  
 #include <net/if.h>
@@ -33,7 +33,7 @@
 #include <netinet/ip_frag.h>
 #include <netinet/ip_sync.h>
 
-#if __FreeBSD_version >= 502116
+#if __FreeBSD_version >= 502116 || defined(__MidnightBSD__)
 static struct cdev *ipf_devs[IPL_LOGSIZE];
 #else
 static dev_t ipf_devs[IPL_LOGSIZE];
@@ -100,12 +100,12 @@
 
 #define CDEV_MAJOR 79
 #include <sys/poll.h>
-#if __FreeBSD_version >= 500043
+#if __FreeBSD_version >= 500043 || defined(__MidnightBSD__)
 # include <sys/select.h>
 static int iplpoll(struct cdev *dev, int events, struct thread *td);
 
 static struct cdevsw ipl_cdevsw = {
-# if __FreeBSD_version >= 502103
+# if __FreeBSD_version >= 502103 || defined(__MidnightBSD__)
 	.d_version =	D_VERSION,
 	.d_flags =	0,	/* D_NEEDGIANT - Should be SMP safe */
 # endif
@@ -115,7 +115,7 @@
 	.d_write =	iplwrite,
 	.d_ioctl =	iplioctl,
 	.d_name =	"ipl",
-# if __FreeBSD_version >= 500043
+# if __FreeBSD_version >= 500043 || defined(__MidnightBSD__)
 	.d_poll =	iplpoll,
 # endif
 # if __FreeBSD_version < 600000
@@ -142,7 +142,7 @@
 # if (__FreeBSD_version < 500043)
 	/* bmaj */	-1,
 # endif
-# if (__FreeBSD_version > 430000)
+# if (__FreeBSD_version > 430000) || defined(__MidnightBSD__)
 	/* kqfilter */	NULL
 # endif
 };
@@ -313,7 +313,7 @@
 
 
 static int
-#if __FreeBSD_version >= 500043
+#if __FreeBSD_version >= 500043 || defined(__MidnightBSD__)
 iplpoll(struct cdev *dev, int events, struct thread *td)
 #else
 iplpoll(dev_t dev, int events, struct proc *td)
Index: ip_sync.c
===================================================================
RCS file: /home/cvs/src/sys/contrib/ipfilter/netinet/ip_sync.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -L sys/contrib/ipfilter/netinet/ip_sync.c -L sys/contrib/ipfilter/netinet/ip_sync.c -u -r1.2 -r1.3
--- sys/contrib/ipfilter/netinet/ip_sync.c
+++ sys/contrib/ipfilter/netinet/ip_sync.c
@@ -36,10 +36,12 @@
 #if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
 # include <sys/proc.h>
 #endif
-#if defined(_KERNEL) && (__FreeBSD_version >= 220000)
+#if defined(_KERNEL) && \
+    ((__FreeBSD_version >= 220000) || defined(__MidnightBSD__))
 # include <sys/filio.h>
 # include <sys/fcntl.h>
-# if (__FreeBSD_version >= 300000) && !defined(IPFILTER_LKM)
+# if (defined(__MidnightBSD__) || (__FreeBSD_version >= 300000)) && \
+    !defined(IPFILTER_LKM)
 #  include "opt_ipfilter.h"
 # endif
 #else
@@ -88,7 +90,7 @@
 #ifdef  USE_INET6
 #include <netinet/icmp6.h>
 #endif
-#if (__FreeBSD_version >= 300000)
+#if (__FreeBSD_version >= 300000) || defined(__MidnightBSD__)
 # include <sys/malloc.h>
 # if defined(_KERNEL) && !defined(IPFILTER_LKM)
 #  include <sys/libkern.h>
@@ -292,7 +294,8 @@
 
 	int err = 0;
 
-#  if (BSD >= 199306) || defined(__FreeBSD__) || defined(__osf__)
+#  if (BSD >= 199306) || defined(__FreeBSD__) || defined(__osf__) || \
+    defined(__MidnightBSD__)
 	uio->uio_rw = UIO_WRITE;
 #  endif
 
@@ -428,7 +431,8 @@
 	if ((uio->uio_resid & 3) || (uio->uio_resid < 8))
 		return EINVAL;
 
-#  if (BSD >= 199306) || defined(__FreeBSD__) || defined(__osf__)
+#  if (BSD >= 199306) || defined(__FreeBSD__) || defined(__osf__) || \
+    defined(__MidnightBSD__)
 	uio->uio_rw = UIO_READ;
 #  endif