Date: Sat, 8 Jun 2019 22:29:51 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r348822 - stable/11/sys/contrib/ipfilter/netinet Message-ID: <201906082229.x58MTpHI093685@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Sat Jun 8 22:29:51 2019 New Revision: 348822 URL: https://svnweb.freebsd.org/changeset/base/348822 Log: MFC r348320: Contuation of r343701, removal of irrelevant #ifdefs. Approved by: re (gjb@) Modified: stable/11/sys/contrib/ipfilter/netinet/ip_frag.c stable/11/sys/contrib/ipfilter/netinet/ip_proxy.h stable/11/sys/contrib/ipfilter/netinet/ip_rules.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/contrib/ipfilter/netinet/ip_frag.c ============================================================================== --- stable/11/sys/contrib/ipfilter/netinet/ip_frag.c Sat Jun 8 22:28:28 2019 (r348821) +++ stable/11/sys/contrib/ipfilter/netinet/ip_frag.c Sat Jun 8 22:29:51 2019 (r348822) @@ -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: stable/11/sys/contrib/ipfilter/netinet/ip_proxy.h ============================================================================== --- stable/11/sys/contrib/ipfilter/netinet/ip_proxy.h Sat Jun 8 22:28:28 2019 (r348821) +++ stable/11/sys/contrib/ipfilter/netinet/ip_proxy.h Sat Jun 8 22:29:51 2019 (r348822) @@ -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: stable/11/sys/contrib/ipfilter/netinet/ip_rules.c ============================================================================== --- stable/11/sys/contrib/ipfilter/netinet/ip_rules.c Sat Jun 8 22:28:28 2019 (r348821) +++ stable/11/sys/contrib/ipfilter/netinet/ip_rules.c Sat Jun 8 22:29:51 2019 (r348822) @@ -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__)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201906082229.x58MTpHI093685>