diff options
Diffstat (limited to 'contrib/libpcap/pcap-namedb.h')
| -rw-r--r-- | contrib/libpcap/pcap-namedb.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/contrib/libpcap/pcap-namedb.h b/contrib/libpcap/pcap-namedb.h index 83ddec1..4833c4d 100644 --- a/contrib/libpcap/pcap-namedb.h +++ b/contrib/libpcap/pcap-namedb.h @@ -30,12 +30,16 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#) $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 #define lib_pcap_ethers_h +#ifdef __cplusplus +extern "C" { +#endif + /* * As returned by the pcap_next_etherent() * XXX this stuff doesn't belong in this interface, but this @@ -54,10 +58,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 *); @@ -77,4 +80,8 @@ int __pcap_atodn(const char *, bpf_u_int32 *); int __pcap_atoin(const char *, bpf_u_int32 *); u_short __pcap_nametodnaddr(const char *); +#ifdef __cplusplus +} +#endif + #endif |
