summaryrefslogtreecommitdiff
path: root/sys/net
diff options
context:
space:
mode:
authorDaniel Hartmeier <dhartmei@cvs.openbsd.org>2001-09-04 08:55:38 +0000
committerDaniel Hartmeier <dhartmei@cvs.openbsd.org>2001-09-04 08:55:38 +0000
commit35232f5ed02cb479eae1fee05f77f28cf6ce4c03 (patch)
treec0cd309110ed8021b771132a8ac85c6e7d3360d9 /sys/net
parentdac03068fb010ebc342fd9e4a74d24e1a89a153c (diff)
#define empty PFLOG_PACKET correctly (no side effects). Closes PR2044.
From Claus Assmann.
Diffstat (limited to 'sys/net')
-rw-r--r--sys/net/pf.c4
-rw-r--r--sys/net/pf_norm.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/net/pf.c b/sys/net/pf.c
index aff74a2edbb..6ee19e7e4bc 100644
--- a/sys/net/pf.c
+++ b/sys/net/pf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pf.c,v 1.142 2001/08/31 23:05:22 frantzen Exp $ */
+/* $OpenBSD: pf.c,v 1.143 2001/09/04 08:55:37 dhartmei Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
@@ -221,7 +221,7 @@ int pf_normalize_tcp(int, struct ifnet *, struct mbuf *,
NTOHS((x)->ip_off); \
} while (0)
#else
-#define PFLOG_PACKET
+#define PFLOG_PACKET(x,a,b,c,d,e) ((void)0)
#endif
#define STATE_TRANSLATE(s) \
diff --git a/sys/net/pf_norm.c b/sys/net/pf_norm.c
index d7b7e3f4348..8ecdfc3a90e 100644
--- a/sys/net/pf_norm.c
+++ b/sys/net/pf_norm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pf_norm.c,v 1.7 2001/08/31 23:05:22 frantzen Exp $ */
+/* $OpenBSD: pf_norm.c,v 1.8 2001/09/04 08:55:37 dhartmei Exp $ */
/*
* Copyright 2001 Niels Provos <provos@citi.umich.edu>
@@ -105,7 +105,7 @@ int pf_normalize_tcp(int, struct ifnet *, struct mbuf *,
NTOHS((x)->ip_off); \
} while (0)
#else
-#define PFLOG_PACKET
+#define PFLOG_PACKET(x,a,b,c,d,e) ((void)0)
#endif
/* Globals */