Date: Tue, 16 Feb 2021 00:46:37 GMT From: Cy Schubert <cy@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: d4582137abc2 - stable/12 - MFC d20f7a5a3da1aa5bccdabb89c181ca0c49385ecd: Message-ID: <202102160046.11G0kbfX006451@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=d4582137abc299998c92e8613597dbe35881b2aa commit d4582137abc299998c92e8613597dbe35881b2aa Author: Cy Schubert <cy@FreeBSD.org> AuthorDate: 2021-02-07 03:15:27 +0000 Commit: Cy Schubert <cy@FreeBSD.org> CommitDate: 2021-02-16 00:40:49 +0000 MFC d20f7a5a3da1aa5bccdabb89c181ca0c49385ecd: Simply FreeBSD check using __FreeBSD__ and remove OpenBSD (cherry picked from commit d20f7a5a3da1aa5bccdabb89c181ca0c49385ecd) --- contrib/ipfilter/lib/printaps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/ipfilter/lib/printaps.c b/contrib/ipfilter/lib/printaps.c index 0304f34c6010..47c8def6106b 100644 --- a/contrib/ipfilter/lib/printaps.c +++ b/contrib/ipfilter/lib/printaps.c @@ -47,7 +47,7 @@ printaps(aps, opts, proto) ap.aps_state[0], ap.aps_state[1], ap.aps_sel[0], ap.aps_sel[1]); #if (defined(NetBSD) && (NetBSD >= 199905) && (NetBSD < 1991011)) || \ - (__FreeBSD_version >= 300000) || defined(OpenBSD) + defined(__FreeBSD__) PRINTF("\t\tseq: off %hd/%hd min %x/%x\n", ap.aps_seqoff[0], ap.aps_seqoff[1], ap.aps_seqmin[0], ap.aps_seqmin[1]);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202102160046.11G0kbfX006451>