From 6065343dde51fa39a036c466790ca8460763014b Mon Sep 17 00:00:00 2001
From: yamt <yamt@NetBSD.org>
Date: Tue, 7 Aug 2007 10:02:40 +0000
Subject: [PATCH] reduce diff.

---
 sys/dist/pf/net/pf.c    |  3 ++-
 sys/dist/pf/net/pfvar.h | 16 +---------------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/sys/dist/pf/net/pf.c b/sys/dist/pf/net/pf.c
index 0fd256355be8..7b1f43e101ec 100644
--- a/sys/dist/pf/net/pf.c
+++ b/sys/dist/pf/net/pf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pf.c,v 1.39 2007/05/17 17:04:12 christos Exp $	*/
+/*	$NetBSD: pf.c,v 1.40 2007/08/07 10:08:21 yamt Exp $	*/
 /*	$OpenBSD: pf.c,v 1.487 2005/04/22 09:53:18 dhartmei Exp $ */
 
 /*
@@ -104,6 +104,7 @@
 #include <netinet6/nd6.h>
 #endif /* INET6 */
 
+
 #define DPFPRINTF(n, x)	if (pf_status.debug >= (n)) printf x
 
 /*
diff --git a/sys/dist/pf/net/pfvar.h b/sys/dist/pf/net/pfvar.h
index 8187eab51495..48bd0c701346 100644
--- a/sys/dist/pf/net/pfvar.h
+++ b/sys/dist/pf/net/pfvar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: pfvar.h,v 1.14 2007/03/04 06:02:59 christos Exp $	*/
+/*	$NetBSD: pfvar.h,v 1.15 2007/08/07 10:02:40 yamt Exp $	*/
 /*	$OpenBSD: pfvar.h,v 1.213 2005/03/03 07:13:39 dhartmei Exp $ */
 
 /*
@@ -1608,20 +1608,6 @@ int pfil_ifaddr_wrapper(void *, struct mbuf **, struct ifnet *, int);
 #define	PRIu32	"u"	/* XXX */
 #endif
 #if !defined(__OpenBSD__)
-#if !defined(__NetBSD__)
-#include <sys/kernel.h> /* mono_time */
-static __inline void getmicrouptime(struct timeval *);
-static __inline void
-getmicrouptime(struct timeval *tvp)
-{
-	int s;
-
-	s = splclock();
-	*tvp = mono_time;
-	splx(s);
-}
-#define	time_second	time.tv_sec
-#endif /* !__NetBSD__ */
 #define	m_copym2	m_dup
 #define	pool_allocator_oldnointr	pool_allocator_nointr
 #endif /* !__OpenBSD__ */