diff options
author | sam <sam@FreeBSD.org> | 2005-07-11 03:43:25 +0000 |
---|---|---|
committer | sam <sam@FreeBSD.org> | 2005-07-11 03:43:25 +0000 |
commit | b0948cc146b74585abbc8e1ddb07a0ed768ac090 (patch) | |
tree | b1290283be00a899ee2c6555fc04d310d7b651d8 /contrib/libpcap/pcap-namedb.h | |
parent | 17d5b030de962032fa5ffb4b3f2b4b774145bb34 (diff) | |
download | FreeBSD-src-b0948cc146b74585abbc8e1ddb07a0ed768ac090.zip FreeBSD-src-b0948cc146b74585abbc8e1ddb07a0ed768ac090.tar.gz |
resolve merge conflicts
Approved by: re (scottl)
Diffstat (limited to 'contrib/libpcap/pcap-namedb.h')
-rw-r--r-- | contrib/libpcap/pcap-namedb.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/libpcap/pcap-namedb.h b/contrib/libpcap/pcap-namedb.h index f44c07b..bbd06b0 100644 --- a/contrib/libpcap/pcap-namedb.h +++ b/contrib/libpcap/pcap-namedb.h @@ -66,6 +66,7 @@ struct addrinfo *pcap_nametoaddrinfo(const char *); bpf_u_int32 pcap_nametonetaddr(const char *); int pcap_nametoport(const char *, int *, int *); +int pcap_nametoportrange(const char *, int *, int *, int *); int pcap_nametoproto(const char *); int pcap_nametoeproto(const char *); int pcap_nametollc(const char *); |