From be9dcae1327bd7254294b978f20a02b081c2ffe7 Mon Sep 17 00:00:00 2001 From: martin Date: Tue, 22 Jun 2004 18:37:49 +0000 Subject: [PATCH] Fix formatting for 64 bit archs. This fixes PR port-sparc64/26010. While there, make it compile for non-INET6 aware kernels. --- sys/dist/pf/net/pf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dist/pf/net/pf.c b/sys/dist/pf/net/pf.c index 3d61f635c255..28586ea1319e 100644 --- a/sys/dist/pf/net/pf.c +++ b/sys/dist/pf/net/pf.c @@ -1,4 +1,4 @@ -/* $NetBSD: pf.c,v 1.2 2004/06/22 14:17:07 itojun Exp $ */ +/* $NetBSD: pf.c,v 1.3 2004/06/22 18:37:49 martin Exp $ */ /* $OpenBSD: pf.c,v 1.433 2004/03/26 22:20:57 dhartmei Exp $ */ /* @@ -684,7 +684,7 @@ pf_insert_state(struct pfi_kif *kif, struct pf_state *state) betoh64(state->id), ntohl(state->creatorid)); #else printf("pf: state insert failed: " - "id: %016llx creatorid: %08x", + "id: %016" PRIx64 " creatorid: %08x", be64toh(state->id), ntohl(state->creatorid)); #endif if (state->sync_flags & PFSTATE_FROMSYNC) @@ -2237,7 +2237,7 @@ pf_socket_lookup(uid_t *uid, gid_t *gid, int direction, struct pf_pdesc *pd) u_int16_t sport, dport; struct inpcbtable *tb; struct inpcb *inp = NULL; -#ifdef __NetBSD__ +#if defined(__NetBSD__) && defined(INET6) struct in6pcb *in6p = NULL; #endif