Date: Tue, 11 Jun 2019 03:07:23 +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-12@freebsd.org Subject: svn commit: r348890 - stable/12/sys/contrib/ipfilter/netinet Message-ID: <201906110307.x5B37NDU058786@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Tue Jun 11 03:07:23 2019 New Revision: 348890 URL: https://svnweb.freebsd.org/changeset/base/348890 Log: MFC r348667: While working on a PR, more are discovered. Remove more #ifdefs missed in r343701. Modified: stable/12/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c ============================================================================== --- stable/12/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Tue Jun 11 03:06:36 2019 (r348889) +++ stable/12/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Tue Jun 11 03:07:23 2019 (r348890) @@ -16,11 +16,11 @@ static const char rcsid[] = "@(#)$Id$"; # define KERNEL 1 # define _KERNEL 1 #endif -#if defined(__FreeBSD_version) && (__FreeBSD_version >= 400000) && \ +#if defined(__FreeBSD_version) && \ !defined(KLD_MODULE) && !defined(IPFILTER_LKM) # include "opt_inet6.h" #endif -#if defined(__FreeBSD_version) && (__FreeBSD_version >= 440000) && \ +#if defined(__FreeBSD_version) && \ !defined(KLD_MODULE) && !defined(IPFILTER_LKM) # include "opt_random_ip_id.h" #endif @@ -33,7 +33,7 @@ static const char rcsid[] = "@(#)$Id$"; #include <sys/time.h> #include <sys/systm.h> # include <sys/dirent.h> -#if defined(__FreeBSD_version) && (__FreeBSD_version >= 800000) +#if defined(__FreeBSD_version) #include <sys/jail.h> #endif # include <sys/malloc.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201906110307.x5B37NDU058786>