diff options
| -rw-r--r-- | usr.sbin/rtadvd/config.c | 5 | ||||
| -rw-r--r-- | usr.sbin/rtadvd/dump.c | 12 | ||||
| -rw-r--r-- | usr.sbin/rtadvd/if.c | 13 | ||||
| -rw-r--r-- | usr.sbin/rtadvd/if.h | 2 | ||||
| -rw-r--r-- | usr.sbin/rtadvd/rrenum.c | 2 | ||||
| -rw-r--r-- | usr.sbin/rtadvd/timer.c | 3 | ||||
| -rw-r--r-- | usr.sbin/rtsold/if.c | 13 | ||||
| -rw-r--r-- | usr.sbin/rtsold/probe.c | 2 |
8 files changed, 5 insertions, 47 deletions
diff --git a/usr.sbin/rtadvd/config.c b/usr.sbin/rtadvd/config.c index 7f3d417..d494182 100644 --- a/usr.sbin/rtadvd/config.c +++ b/usr.sbin/rtadvd/config.c @@ -37,9 +37,7 @@ #include <sys/sysctl.h> #include <net/if.h> -#if defined(__FreeBSD__) && __FreeBSD__ >= 3 #include <net/if_var.h> -#endif /* __FreeBSD__ >= 3 */ #include <net/route.h> #include <net/if_dl.h> @@ -56,9 +54,6 @@ #include <errno.h> #include <string.h> #include <stdlib.h> -#if defined(__NetBSD__) || defined(__OpenBSD__) -#include <search.h> -#endif #include <unistd.h> #include <ifaddrs.h> diff --git a/usr.sbin/rtadvd/dump.c b/usr.sbin/rtadvd/dump.c index bd19687..65e7ca2 100644 --- a/usr.sbin/rtadvd/dump.c +++ b/usr.sbin/rtadvd/dump.c @@ -34,9 +34,7 @@ #include <sys/queue.h> #include <net/if.h> -#if defined(__FreeBSD__) && __FreeBSD__ >= 3 #include <net/if_var.h> -#endif /* __FreeBSD__ >= 3 */ #include <net/if_dl.h> #include <netinet/in.h> @@ -66,12 +64,6 @@ extern struct rainfo *ralist; static char *ether_str __P((struct sockaddr_dl *)); static void if_dump __P((void)); -#ifdef __FreeBSD__ /* XXX: see PORTABILITY */ -#define LONGLONG "%qu" -#else -#define LONGLONG "%llu" -#endif - static char *rtpref_str[] = { "medium", /* 00 */ "high", /* 01 */ @@ -130,11 +122,11 @@ if_dump() /* statistics */ fprintf(fp, " statistics: RA(out/in/inconsistent): " - LONGLONG "/" LONGLONG "/" LONGLONG ", ", + "%llu/%llu/%llu, ", (unsigned long long)rai->raoutput, (unsigned long long)rai->rainput, (unsigned long long)rai->rainconsistent); - fprintf(fp, "RS(input): " LONGLONG "\n", + fprintf(fp, "RS(input): %llu\n", (unsigned long long)rai->rsinput); /* interface information */ diff --git a/usr.sbin/rtadvd/if.c b/usr.sbin/rtadvd/if.c index f483ff4..a6517f2 100644 --- a/usr.sbin/rtadvd/if.c +++ b/usr.sbin/rtadvd/if.c @@ -36,23 +36,12 @@ #include <sys/ioctl.h> #include <net/if.h> #include <net/if_types.h> -#ifdef __FreeBSD__ -# include <net/ethernet.h> -#endif +#include <net/ethernet.h> #include <ifaddrs.h> -#ifdef __NetBSD__ -#include <net/if_ether.h> -#endif #include <net/route.h> #include <net/if_dl.h> #include <netinet/in.h> #include <netinet/icmp6.h> -#ifdef __bsdi__ -# include <netinet/if_ether.h> -#endif -#ifdef __OpenBSD__ -#include <netinet/if_ether.h> -#endif #include <unistd.h> #include <errno.h> #include <stdlib.h> diff --git a/usr.sbin/rtadvd/if.h b/usr.sbin/rtadvd/if.h index 23f9a98..07bb6ee 100644 --- a/usr.sbin/rtadvd/if.h +++ b/usr.sbin/rtadvd/if.h @@ -1,5 +1,5 @@ /* $FreeBSD$ */ -/* $KAME: if.h,v 1.6 2001/01/21 15:37:14 itojun Exp $ */ +/* $KAME: if.h,v 1.10 2003/02/24 11:29:10 ono Exp $ */ /* * Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project. diff --git a/usr.sbin/rtadvd/rrenum.c b/usr.sbin/rtadvd/rrenum.c index 59c125b..95cbd24 100644 --- a/usr.sbin/rtadvd/rrenum.c +++ b/usr.sbin/rtadvd/rrenum.c @@ -36,9 +36,7 @@ #include <sys/sysctl.h> #include <net/if.h> -#if defined(__FreeBSD__) && __FreeBSD__ >= 3 #include <net/if_var.h> -#endif /* __FreeBSD__ >= 3 */ #include <net/route.h> #include <netinet/in.h> #include <netinet/in_var.h> diff --git a/usr.sbin/rtadvd/timer.c b/usr.sbin/rtadvd/timer.c index f30fb37..fb9f299 100644 --- a/usr.sbin/rtadvd/timer.c +++ b/usr.sbin/rtadvd/timer.c @@ -36,9 +36,6 @@ #include <syslog.h> #include <stdlib.h> #include <string.h> -#if defined(__NetBSD__) || defined(__OpenBSD__) -#include <search.h> -#endif #include "timer.h" static struct rtadvd_timer timer_head; diff --git a/usr.sbin/rtsold/if.c b/usr.sbin/rtsold/if.c index 3d4632e..d2cc01e 100644 --- a/usr.sbin/rtsold/if.c +++ b/usr.sbin/rtsold/if.c @@ -38,23 +38,12 @@ #include <sys/queue.h> #include <net/if.h> -#if defined(__FreeBSD__) && __FreeBSD__ >= 3 #include <net/if_var.h> -#endif /* __FreeBSD__ >= 3 */ #include <net/if_types.h> #include <net/route.h> #include <net/if_dl.h> #include <net/if_media.h> -#ifdef __FreeBSD__ -# include <net/ethernet.h> -#endif -#ifdef __NetBSD__ -#include <net/if_ether.h> -#endif -#if defined(__bsdi__) || defined(__OpenBSD__) -# include <netinet/in.h> -# include <netinet/if_ether.h> -#endif +#include <net/ethernet.h> #include <netinet/in.h> #include <netinet/icmp6.h> diff --git a/usr.sbin/rtsold/probe.c b/usr.sbin/rtsold/probe.c index a946381..9b86c63 100644 --- a/usr.sbin/rtsold/probe.c +++ b/usr.sbin/rtsold/probe.c @@ -39,9 +39,7 @@ #include <sys/queue.h> #include <net/if.h> -#if defined(__FreeBSD__) && __FreeBSD__ >= 3 #include <net/if_var.h> -#endif /* __FreeBSD__ >= 3 */ #include <netinet/in.h> #include <netinet6/in6_var.h> |
