Author: cy
Date: Tue May 28 01:41:08 2019
New Revision: 348320
URL: https://svnweb.freebsd.org/changeset/base/348320
Log:
Contuation of r343701, removal of irrelevant #ifdefs.
MFC after: 1 week
Modified:
head/sys/contrib/ipfilter/netinet/ip_frag.c
head/sys/contrib/ipfilter/netinet/ip_proxy.h
head/sys/contrib/ipfilter/netinet/ip_rules.c
Modified: head/sys/contrib/ipfilter/netinet/ip_frag.c
==============================================================================
--- head/sys/contrib/ipfilter/netinet/ip_frag.c Tue May 28 01:09:19 2019
(r348319)
+++ head/sys/contrib/ipfilter/netinet/ip_frag.c Tue May 28 01:41:08 2019
(r348320)
@@ -34,11 +34,11 @@
#include <sys/socket.h>
#if defined(_KERNEL)
# include <sys/systm.h>
-# if !defined(__SVR4) && !defined(__svr4__)
+# if !defined(__SVR4)
# include <sys/mbuf.h>
# endif
#endif
-#if !defined(__SVR4) && !defined(__svr4__)
+#if !defined(__SVR4)
# if defined(_KERNEL)
# include <sys/kernel.h>
# endif
Modified: head/sys/contrib/ipfilter/netinet/ip_proxy.h
==============================================================================
--- head/sys/contrib/ipfilter/netinet/ip_proxy.h Tue May 28 01:09:19
2019 (r348319)
+++ head/sys/contrib/ipfilter/netinet/ip_proxy.h Tue May 28 01:41:08
2019 (r348320)
@@ -13,14 +13,14 @@
#define __IP_PROXY_H__
#ifndef SOLARIS
-# if defined(sun) && (defined(__svr4__) || defined(__SVR4))
+# if defined(sun) && defined(__SVR4))
# define SOLARIS 1
# else
# define SOLARIS 0
# endif
#endif
-#if defined(__STDC__) || defined(__GNUC__) || defined(_AIX51)
+#if defined(__STDC__) || defined(__GNUC__)
#define SIOCPROXY _IOWR('r', 64, struct ap_control)
#else
#define SIOCPROXY _IOWR(r, 64, struct ap_control)
Modified: head/sys/contrib/ipfilter/netinet/ip_rules.c
==============================================================================
--- head/sys/contrib/ipfilter/netinet/ip_rules.c Tue May 28 01:09:19
2019 (r348319)
+++ head/sys/contrib/ipfilter/netinet/ip_rules.c Tue May 28 01:41:08
2019 (r348320)
@@ -12,22 +12,18 @@
#include <sys/types.h>
#include <sys/time.h>
#include <sys/socket.h>
-#if defined(__FreeBSD_version) && (__FreeBSD_version >= 40000)
+#if defined(__FreeBSD_version)
# if defined(_KERNEL)
# include <sys/libkern.h>
# else
# include <sys/unistd.h>
# endif
-#endif
-#if defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 399000000)
#else
-# if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__sgi)
-# include <sys/systm.h>
-# endif
+# include <sys/systm.h>
#endif
#include <sys/errno.h>
#include <sys/param.h>
-#if !defined(__SVR4) && !defined(__svr4__) && !defined(__hpux)
+#if !defined(__SVR4)
# include <sys/mbuf.h>
#endif
#if defined(__FreeBSD__)
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
