[src/trunk]: src/sys/dist/pf/net Unbreak the build of pf

[ozaki-r <ozaki-r%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/75a6ba0d834d
branches:  trunk
changeset: 330896:75a6ba0d834d
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Fri Jul 25 04:09:58 2014 +0000

description:
Unbreak the build of pf

diffstat:

 sys/dist/pf/net/pf.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (50 lines):

diff -r 42a4ddb3a3e4 -r 75a6ba0d834d sys/dist/pf/net/pf.c
--- a/sys/dist/pf/net/pf.c      Fri Jul 25 01:38:26 2014 +0000
+++ b/sys/dist/pf/net/pf.c      Fri Jul 25 04:09:58 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pf.c,v 1.71 2014/06/05 23:48:16 rmind Exp $    */
+/*     $NetBSD: pf.c,v 1.72 2014/07/25 04:09:58 ozaki-r Exp $  */
 /*     $OpenBSD: pf.c,v 1.552.2.1 2007/11/27 16:37:57 henning Exp $ */
 
 /*
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pf.c,v 1.71 2014/06/05 23:48:16 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pf.c,v 1.72 2014/07/25 04:09:58 ozaki-r Exp $");
 
 #include "pflog.h"
 
@@ -5963,6 +5963,7 @@
 #endif /* !__NetBSD__ */
 
        if (log) {
+#if NPFLOG > 0
                struct pf_rule *lr;
 
                if (s != NULL && s->nat_rule.ptr != NULL &&
@@ -5972,6 +5973,7 @@
                        lr = r;
                PFLOG_PACKET(kif, h, m, AF_INET, dir, reason, lr, a, ruleset,
                    &pd);
+#endif
        }
 
        kif->pfik_bytes[0][dir == PF_OUT][action != PF_PASS] += pd.tot_len;
@@ -6383,6 +6385,7 @@
 #endif /* !__NetBSD__ */
 
        if (log) {
+#if NPFLOG > 0
                struct pf_rule *lr;
 
                if (s != NULL && s->nat_rule.ptr != NULL &&
@@ -6392,6 +6395,7 @@
                        lr = r;
                PFLOG_PACKET(kif, h, m, AF_INET6, dir, reason, lr, a, ruleset,
                    &pd);
+#endif
        }
 
        kif->pfik_bytes[1][dir == PF_OUT][action != PF_PASS] += pd.tot_len;