aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorguy <guy>2000-12-18 03:42:39 +0000
committerguy <guy>2000-12-18 03:42:39 +0000
commit839690365fd1d37532237c31c8cab18c995604f7 (patch)
tree40db8b6e8de385e7116860040cb08be2965bb859
parent6fc6ca1eb5b210607b9e473d30d1a89773b18a6b (diff)
As per many suggestions, the most recent in mail to
"patches@tcpdump.org" by Jonathan Wilkins <jwilkins@madscience.dyndns.org>, we don't declare "ether_hostton()" on FreeBSD - it's declared in <net/ethernet.h> in 3.0 and later, and is declared with the first argument as "const char *" in 4.0 and later so that if we declare it with the first argument as "char *" we get errors. (If we declare it with "const char *", you get errors on FreeBSD 3.x and other systems that *don't* declare it with "const char *".) XXX - should it go, instead, into "lbl/os-XXX.h" files, for those OS versions that don't declare it, and not be declared at all here?
-rw-r--r--nametoaddr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/nametoaddr.c b/nametoaddr.c
index 0aa8de9..e4b596d 100644
--- a/nametoaddr.c
+++ b/nametoaddr.c
@@ -24,7 +24,7 @@
#ifndef lint
static const char rcsid[] =
- "@(#) $Header: /tcpdump/master/libpcap/nametoaddr.c,v 1.55 2000-10-10 04:53:54 guy Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/libpcap/nametoaddr.c,v 1.56 2000-12-18 03:42:39 guy Exp $ (LBL)";
#endif
#ifdef HAVE_CONFIG_H
@@ -355,7 +355,7 @@ pcap_ether_hostton(const char *name)
}
#else
-#if !defined(sgi) && !defined(__NetBSD__)
+#if !defined(sgi) && !defined(__NetBSD__) && !defined(__FreeBSD__)
extern int ether_hostton(char *, struct ether_addr *);
#endif