diff options
| author | fenner <fenner@FreeBSD.org> | 2001-04-03 04:32:48 +0000 |
|---|---|---|
| committer | fenner <fenner@FreeBSD.org> | 2001-04-03 04:32:48 +0000 |
| commit | d32fa93f24ce5894c091b4ef4250282b79b0c97a (patch) | |
| tree | 00b0f42b64d9b575c61aa73d86663036cce36d6d /contrib/libpcap/pcap-namedb.h | |
| parent | 5ccd472c6889df29bc50ce8be4693073dc13e49c (diff) | |
| download | FreeBSD-src-d32fa93f24ce5894c091b4ef4250282b79b0c97a.zip FreeBSD-src-d32fa93f24ce5894c091b4ef4250282b79b0c97a.tar.gz | |
Merge libpcap 0.6.2
Diffstat (limited to 'contrib/libpcap/pcap-namedb.h')
| -rw-r--r-- | contrib/libpcap/pcap-namedb.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/contrib/libpcap/pcap-namedb.h b/contrib/libpcap/pcap-namedb.h index 57e7598..43fe1ed 100644 --- a/contrib/libpcap/pcap-namedb.h +++ b/contrib/libpcap/pcap-namedb.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD$ - * @(#) $Header: /tcpdump/master/libpcap/pcap-namedb.h,v 1.6 1999/10/19 15:18:31 itojun Exp $ (LBL) + * @(#) $Header: /tcpdump/master/libpcap/pcap-namedb.h,v 1.8 2000/07/29 07:36:43 guy Exp $ (LBL) */ #ifndef lib_pcap_ethers_h @@ -40,7 +40,6 @@ #ifdef __cplusplus extern "C" { #endif - /* * As returned by the pcap_next_etherent() @@ -60,10 +59,9 @@ struct pcap_etherent *pcap_next_etherent(FILE *); u_char *pcap_ether_hostton(const char*); u_char *pcap_ether_aton(const char *); -#ifndef INET6 bpf_u_int32 **pcap_nametoaddr(const char *); -#else -struct addrinfo *pcap_nametoaddr(const char *); +#ifdef INET6 +struct addrinfo *pcap_nametoaddrinfo(const char *); #endif bpf_u_int32 pcap_nametonetaddr(const char *); @@ -86,6 +84,5 @@ u_short __pcap_nametodnaddr(const char *); #ifdef __cplusplus } #endif - #endif |
