d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reduce #ifdef.

Browse Source 
MFC after:	1 week
This commit is contained in:
Hajimu UMEMOTO 2003-08-11 15:51:54 +00:00
parent bb58b617fb
commit b6ed844ff2
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=118787
8 changed files with 5 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
usr.sbin/rtadvd/config.c
View File

@ -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>

12
usr.sbin/rtadvd/dump.c
View File

@ -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 */

13
usr.sbin/rtadvd/if.c
View File

@ -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>

2
usr.sbin/rtadvd/if.h
View File

@ -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.

2
usr.sbin/rtadvd/rrenum.c
View File

@ -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>

3
usr.sbin/rtadvd/timer.c
View File

@ -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;

13
usr.sbin/rtsold/if.c
View File

@ -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>

2
usr.sbin/rtsold/probe.c
View File

@ -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>