diff options
| author | Bill Fenner <fenner@FreeBSD.org> | 2003-03-02 08:25:48 +0000 |
|---|---|---|
| committer | Bill Fenner <fenner@FreeBSD.org> | 2003-03-02 08:25:48 +0000 |
| commit | 0e0def197a3fd589c6de4f83a8d2f2507611fe65 (patch) | |
| tree | b0f1f85975003f9af2b8eadcb34dd0fccd8153d3 /contrib/tcpdump/addrtoname.c | |
| parent | e32fdc8718073eaf9c8c0c049d5ed8e77fa3e4c6 (diff) | |
| download | src-0e0def197a3fd589c6de4f83a8d2f2507611fe65.tar.gz src-0e0def197a3fd589c6de4f83a8d2f2507611fe65.zip | |
Merge tcpdump 3.7.2
Notes
Notes:
svn path=/head/; revision=111729
Diffstat (limited to 'contrib/tcpdump/addrtoname.c')
| -rw-r--r-- | contrib/tcpdump/addrtoname.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/contrib/tcpdump/addrtoname.c b/contrib/tcpdump/addrtoname.c index 19eedbc53451..99e50dda9fd1 100644 --- a/contrib/tcpdump/addrtoname.c +++ b/contrib/tcpdump/addrtoname.c @@ -25,7 +25,7 @@ */ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/addrtoname.c,v 1.83 2001/09/17 21:57:50 fenner Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/addrtoname.c,v 1.83.4.1 2002/06/02 00:08:07 guy Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -36,14 +36,16 @@ static const char rcsid[] = #include <sys/socket.h> #include <sys/time.h> -struct mbuf; -struct rtentry; -#include <net/if.h> - #include <netinet/in.h> + +#ifdef USE_ETHER_NTOHOST #ifdef HAVE_NETINET_IF_ETHER_H +struct mbuf; /* Squelch compiler warnings on some platforms for */ +struct rtentry; /* declarations in <net/if.h> */ +#include <net/if.h> /* for "struct ifnet" in "struct arpcom" on Solaris */ #include <netinet/if_ether.h> -#endif +#endif /* HAVE_NETINET_IF_ETHER_H */ +#endif /* USE_ETHER_NTOHOST */ #include <arpa/inet.h> |