summaryrefslogtreecommitdiffstats
path: root/contrib/tcpdump/addrtoname.c
diff options
context:
space:
mode:
authorfenner <fenner@FreeBSD.org>2003-03-02 08:25:48 +0000
committerfenner <fenner@FreeBSD.org>2003-03-02 08:25:48 +0000
commit7171542229216f6f35b5cf4670a0b368b0203e68 (patch)
treeb0f1f85975003f9af2b8eadcb34dd0fccd8153d3 /contrib/tcpdump/addrtoname.c
parentaf30588ecb3e2e055e5d53279a1d7fa23e246076 (diff)
downloadFreeBSD-src-7171542229216f6f35b5cf4670a0b368b0203e68.zip
FreeBSD-src-7171542229216f6f35b5cf4670a0b368b0203e68.tar.gz
Merge tcpdump 3.7.2
Diffstat (limited to 'contrib/tcpdump/addrtoname.c')
-rw-r--r--contrib/tcpdump/addrtoname.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/contrib/tcpdump/addrtoname.c b/contrib/tcpdump/addrtoname.c
index 19eedbc..99e50dd 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>
OpenPOWER on IntegriCloud