Date: Thu, 24 Nov 2011 21:23:58 +0000 (UTC) From: Robert Millan <rmh@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r227957 - head/sys/contrib/ipfilter/netinet Message-ID: <201111242123.pAOLNwVZ013294@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rmh Date: Thu Nov 24 21:23:58 2011 New Revision: 227957 URL: http://svn.freebsd.org/changeset/base/227957 Log: Adjust a few old checks to use __FreeBSD_version macro to determine which version of FreeBSD kernel we're compiling. Approved by: kib (mentor) Modified: head/sys/contrib/ipfilter/netinet/ip_compat.h head/sys/contrib/ipfilter/netinet/ip_proxy.c Modified: head/sys/contrib/ipfilter/netinet/ip_compat.h ============================================================================== --- head/sys/contrib/ipfilter/netinet/ip_compat.h Thu Nov 24 20:54:06 2011 (r227956) +++ head/sys/contrib/ipfilter/netinet/ip_compat.h Thu Nov 24 21:23:58 2011 (r227957) @@ -985,10 +985,10 @@ typedef u_int32_t u_32_t; typedef struct mbuf mb_t; # endif /* _KERNEL */ -# if __FreeBSD__ < 3 +# if __FreeBSD_version < 300000 # include <machine/spl.h> # else -# if __FreeBSD__ == 3 +# if __FreeBSD_version < 400000 # if defined(IPFILTER_LKM) && !defined(ACTUALLY_LKM_NOT_KERNEL) # define ACTUALLY_LKM_NOT_KERNEL # endif Modified: head/sys/contrib/ipfilter/netinet/ip_proxy.c ============================================================================== --- head/sys/contrib/ipfilter/netinet/ip_proxy.c Thu Nov 24 20:54:06 2011 (r227956) +++ head/sys/contrib/ipfilter/netinet/ip_proxy.c Thu Nov 24 21:23:58 2011 (r227957) @@ -63,7 +63,7 @@ struct file; # include <sys/stream.h> # include <sys/kmem.h> #endif -#if __FreeBSD__ > 2 +#if __FreeBSD_version >= 300000 # include <sys/queue.h> #endif #include <net/if.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201111242123.pAOLNwVZ013294>