Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reduce diff.

This commit is contained in:
yamt 2007-08-07 10:02:40 +00:00
parent 23cf810fc7
commit 6065343dde
2 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/dist/pf/net/pf.c vendored
View File

@ -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 $ */ /* $OpenBSD: pf.c,v 1.487 2005/04/22 09:53:18 dhartmei Exp $ */
/* /*
@ -104,6 +104,7 @@
#include <netinet6/nd6.h> #include <netinet6/nd6.h>
#endif /* INET6 */ #endif /* INET6 */
#define DPFPRINTF(n, x) if (pf_status.debug >= (n)) printf x #define DPFPRINTF(n, x) if (pf_status.debug >= (n)) printf x
/* /*

16
sys/dist/pf/net/pfvar.h vendored
View File

@ -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 $ */ /* $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 */ #define PRIu32 "u" /* XXX */
#endif #endif
#if !defined(__OpenBSD__) #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 m_copym2 m_dup
#define pool_allocator_oldnointr pool_allocator_nointr #define pool_allocator_oldnointr pool_allocator_nointr
#endif /* !__OpenBSD__ */ #endif /* !__OpenBSD__ */