summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorAngelos D. Keromytis <angelos@cvs.openbsd.org>1999-12-08 12:10:26 +0000
committerAngelos D. Keromytis <angelos@cvs.openbsd.org>1999-12-08 12:10:26 +0000
commitc6e95e6e00764727a45b914079cd34ad969b0a95 (patch)
tree872f95b4cf562f05e9732208912fd6c968781ae8 /sys
parent40ce0245744376990805d842240c04ef34c648ca (diff)
Fix debugging printf compilation.
Diffstat (limited to 'sys')
-rw-r--r--sys/netinet/ip_ipsp.h4
-rw-r--r--sys/netinet/ip_output.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/netinet/ip_ipsp.h b/sys/netinet/ip_ipsp.h
index e3d9eef94f1..0f2a2d8ee19 100644
--- a/sys/netinet/ip_ipsp.h
+++ b/sys/netinet/ip_ipsp.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_ipsp.h,v 1.49 1999/12/08 06:16:56 angelos Exp $ */
+/* $OpenBSD: ip_ipsp.h,v 1.50 1999/12/08 12:10:25 angelos Exp $ */
/*
* The authors of this code are John Ioannidis (ji@tla.org),
@@ -468,7 +468,7 @@ extern struct xformsw xformsw[], *xformswNXFORMSW;
/* Misc. */
extern char *inet_ntoa4(struct in_addr);
-#if INET6
+#ifdef INET6
extern char *inet6_ntoa4(struct in6_addr);
#endif /* INET6 */
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index ec98e1a0dba..c24f67627f0 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_output.c,v 1.55 1999/12/08 06:50:20 itojun Exp $ */
+/* $OpenBSD: ip_output.c,v 1.56 1999/12/08 12:10:25 angelos Exp $ */
/* $NetBSD: ip_output.c,v 1.28 1996/02/13 23:43:07 christos Exp $ */
/*
@@ -74,7 +74,7 @@
#include <net/pfkeyv2.h>
#ifdef ENCDEBUG
-#define DPRINTF(x) if (encdebug) printf x
+#define DPRINTF(x) do { if (encdebug) printf x ; } while (0)
#else
#define DPRINTF(x)
#endif
@@ -558,7 +558,7 @@ sendit:
DPRINTF(("ip_output(): non-existant TDB for SA %s/%08x/%u\n", inet_ntoa4(gw->sen_ipsp_dst), ntohl(gw->sen_ipsp_spi), gw->sen_ipsp_sproto));
#if INET6
else
- DPRINTF(("ip_output(): non-existant TDB for SA %s/%08x/%u\n", inet6_ntoa4(gw->sen_ipsp_dst), ntohl(gw->sen_ipsp_spi), gw->sen_ipsp_sproto));
+ DPRINTF(("ip_output(): non-existant TDB for SA %s/%08x/%u\n", inet6_ntoa4(gw->sen_ipsp6_dst), ntohl(gw->sen_ipsp6_spi), gw->sen_ipsp6_sproto));
#endif /* INET6 */
if (re->re_rt)