diff options
| author | darrenr <darrenr@FreeBSD.org> | 2005-04-28 21:36:30 +0000 |
|---|---|---|
| committer | darrenr <darrenr@FreeBSD.org> | 2005-04-28 21:36:30 +0000 |
| commit | a57939d5ce935586e6d4c19df769d295af3cd333 (patch) | |
| tree | eb3996d30e4feaf31c6cff64abb2bc61cff2e6e7 | |
| parent | 16dd1d18f543b649ff5cfcd9b5c5c9069b33a218 (diff) | |
| download | FreeBSD-src-a57939d5ce935586e6d4c19df769d295af3cd333.zip FreeBSD-src-a57939d5ce935586e6d4c19df769d295af3cd333.tar.gz | |
Don't use quad_t on FreeBSD (deprecated) so use "long long" instead.
Someday this should be converted to uint64_t and printstate.c changed to
use those horrid PRiud64 things.
| -rw-r--r-- | contrib/ipfilter/lib/printstate.c | 2 | ||||
| -rw-r--r-- | sys/contrib/ipfilter/netinet/ip_compat.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/contrib/ipfilter/lib/printstate.c b/contrib/ipfilter/lib/printstate.c index b3350c2..2692052 100644 --- a/contrib/ipfilter/lib/printstate.c +++ b/contrib/ipfilter/lib/printstate.c @@ -64,7 +64,7 @@ u_long now; ips.is_icmp.ici_seq, ips.is_icmp.ici_type); #ifdef USE_QUAD_T - PRINTF("\tforward: pkts in %qd bytes in %qd pkts out %qd bytes out %qd\n\tbackward: pkts in %qd bytes in %qd pkts out %qd bytes out %qd\n", + PRINTF("\tforward: pkts in %lld bytes in %lld pkts out %lld bytes out %lld\n\tbackward: pkts in %lld bytes in %lld pkts out %lld bytes out %lld\n", ips.is_pkts[0], ips.is_bytes[0], ips.is_pkts[1], ips.is_bytes[1], ips.is_pkts[2], ips.is_bytes[2], diff --git a/sys/contrib/ipfilter/netinet/ip_compat.h b/sys/contrib/ipfilter/netinet/ip_compat.h index 7ae4b8f..1da588d 100644 --- a/sys/contrib/ipfilter/netinet/ip_compat.h +++ b/sys/contrib/ipfilter/netinet/ip_compat.h @@ -1389,10 +1389,10 @@ extern void eMrwlock_downgrade __P((eMrwlock_t *, char *, int)); * On BSD's use quad_t as a guarantee for getting at least a 64bit sized * object. */ -#if BSD > 199306 +#if (BSD > 199306) # define USE_QUAD_T -# define U_QUAD_T u_quad_t -# define QUAD_T quad_t +# define U_QUAD_T unsigned long long +# define QUAD_T long long #else /* BSD > 199306 */ # define U_QUAD_T u_long # define QUAD_T long |
