diff options
| author | Guy Harris <guy@alum.mit.edu> | 2004-08-06 19:57:49 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2004-08-06 19:57:49 +0000 |
| commit | 3a583aeb59d627fa6ed3221e7214d7989d98be32 (patch) | |
| tree | 82d8efc2349c5298877c38219c13ba063494bc97 | |
| parent | dbe1fe229ef63b40fdffcbc15dbee2c2575de8ee (diff) | |
From Albert Chin: rename resolv.{ch} to addr_resolv.{ch}, so that an
include of <resolv.h> in any system header file gets the system
<resolv.h> (needed for builds on Tru64 with GTK+ 1.2[.x]).
svn path=/trunk/; revision=11615
81 files changed, 81 insertions, 81 deletions
diff --git a/epan/Makefile.am b/epan/Makefile.am index 09f595e488..0caaf23305 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -39,6 +39,8 @@ INCLUDES = -I$(srcdir)/.. libethereal_la_SOURCES = \ addr_and_mask.c \ addr_and_mask.h \ + addr_resolv.c \ + addr_resolv.h \ address.h \ atalk-utils.c \ atalk-utils.h \ @@ -78,8 +80,6 @@ libethereal_la_SOURCES = \ plugins.h \ proto.c \ proto.h \ - resolv.c \ - resolv.h \ report_err.h \ slab.h \ sna-utils.c \ diff --git a/epan/resolv.c b/epan/addr_resolv.c index 7d7acbbb51..990820535c 100644 --- a/epan/resolv.c +++ b/epan/addr_resolv.c @@ -101,7 +101,7 @@ #include "packet.h" #include "ipv6-utils.h" -#include "resolv.h" +#include "addr_resolv.h" #include "filesystem.h" #include "prefs.h" diff --git a/epan/resolv.h b/epan/addr_resolv.h index 65ad162a3b..65ad162a3b 100644 --- a/epan/resolv.h +++ b/epan/addr_resolv.h diff --git a/epan/column-utils.c b/epan/column-utils.c index 959cb64d9b..d02941cf48 100644 --- a/epan/column-utils.c +++ b/epan/column-utils.c @@ -40,7 +40,7 @@ #include "to_str.h" #include "packet_info.h" #include "pint.h" -#include "resolv.h" +#include "addr_resolv.h" #include "ipv6-utils.h" #include "osi-utils.h" #include "value_string.h" diff --git a/epan/dissectors/packet-afs.c b/epan/dissectors/packet-afs.c index 2292e45bc2..0fa26d72af 100644 --- a/epan/dissectors/packet-afs.c +++ b/epan/dissectors/packet-afs.c @@ -41,7 +41,7 @@ #include <glib.h> #include <epan/packet.h> #include <epan/conversation.h> -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include "packet-rx.h" #include "packet-afs.h" diff --git a/epan/dissectors/packet-ap1394.c b/epan/dissectors/packet-ap1394.c index 9560391eaa..c64eb3e761 100644 --- a/epan/dissectors/packet-ap1394.c +++ b/epan/dissectors/packet-ap1394.c @@ -28,7 +28,7 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include <epan/strutil.h> #include "packet-ap1394.h" diff --git a/epan/dissectors/packet-arp.c b/epan/dissectors/packet-arp.c index a0e5153e13..1af20b4a2f 100644 --- a/epan/dissectors/packet-arp.c +++ b/epan/dissectors/packet-arp.c @@ -30,7 +30,7 @@ #include <glib.h> #include <epan/packet.h> #include <epan/strutil.h> -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include "packet-arp.h" #include "etypes.h" #include "arcnet_pids.h" diff --git a/epan/dissectors/packet-atm.c b/epan/dissectors/packet-atm.c index 1c2420d6d2..5bf4de3dff 100644 --- a/epan/dissectors/packet-atm.c +++ b/epan/dissectors/packet-atm.c @@ -30,7 +30,7 @@ #include <glib.h> #include <epan/packet.h> #include "oui.h" -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include "packet-atm.h" #include "packet-snmp.h" diff --git a/epan/dissectors/packet-auto_rp.c b/epan/dissectors/packet-auto_rp.c index 2bfc62cfcf..8033fac6f9 100644 --- a/epan/dissectors/packet-auto_rp.c +++ b/epan/dissectors/packet-auto_rp.c @@ -32,7 +32,7 @@ #include <string.h> #include <glib.h> #include <epan/packet.h> -#include <epan/resolv.h> +#include <epan/addr_resolv.h> static gint proto_auto_rp = -1; static gint ett_auto_rp = -1; diff --git a/epan/dissectors/packet-beep.c b/epan/dissectors/packet-beep.c index 7b02f1ce17..ab00645d19 100644 --- a/epan/dissectors/packet-beep.c +++ b/epan/dissectors/packet-beep.c @@ -39,7 +39,7 @@ #include <glib.h> #include <string.h> #include <epan/packet.h> -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include "prefs.h" #include <epan/conversation.h> diff --git a/epan/dissectors/packet-bpdu.c b/epan/dissectors/packet-bpdu.c index 194b54d25f..a0d097a64b 100644 --- a/epan/dissectors/packet-bpdu.c +++ b/epan/dissectors/packet-bpdu.c @@ -35,7 +35,7 @@ #include "llcsaps.h" #include "ppptypes.h" #include "chdlctypes.h" -#include <epan/resolv.h> +#include <epan/addr_resolv.h> /* Offsets of fields within a BPDU */ diff --git a/epan/dissectors/packet-chdlc.c b/epan/dissectors/packet-chdlc.c index 18eef17644..80c83d6230 100644 --- a/epan/dissectors/packet-chdlc.c +++ b/epan/dissectors/packet-chdlc.c @@ -31,7 +31,7 @@ #include "etypes.h" #include "prefs.h" #include "chdlctypes.h" -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include "packet-chdlc.h" #include "packet-ppp.h" #include "packet-ip.h" diff --git a/epan/dissectors/packet-dec-bpdu.c b/epan/dissectors/packet-dec-bpdu.c index 13c4984133..93dc6db819 100644 --- a/epan/dissectors/packet-dec-bpdu.c +++ b/epan/dissectors/packet-dec-bpdu.c @@ -32,7 +32,7 @@ #include <string.h> #include <glib.h> #include <epan/packet.h> -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include "etypes.h" #include "ppptypes.h" diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c index acb9466014..f03bb07631 100644 --- a/epan/dissectors/packet-diameter.c +++ b/epan/dissectors/packet-diameter.c @@ -47,7 +47,7 @@ #include <epan/filesystem.h> #include "xmlstub.h" #include <epan/packet.h> -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include <epan/report_err.h> #include "prefs.h" #include "packet-tcp.h" diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c index bf23288f13..e402f86817 100644 --- a/epan/dissectors/packet-dns.c +++ b/epan/dissectors/packet-dns.c @@ -38,7 +38,7 @@ #include <epan/ipv6-utils.h> #include <epan/packet.h> #include "ipproto.h" -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include "packet-dns.h" #include "packet-tcp.h" #include "prefs.h" diff --git a/epan/dissectors/packet-eigrp.c b/epan/dissectors/packet-eigrp.c index 70138f71b2..7f28ed6a9f 100644 --- a/epan/dissectors/packet-eigrp.c +++ b/epan/dissectors/packet-eigrp.c @@ -29,7 +29,7 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include <epan/atalk-utils.h> #include <epan/addr_and_mask.h> diff --git a/epan/dissectors/packet-enc.c b/epan/dissectors/packet-enc.c index e061f454a0..1fc1aa8197 100644 --- a/epan/dissectors/packet-enc.c +++ b/epan/dissectors/packet-enc.c @@ -31,7 +31,7 @@ #include <glib.h> #include <epan/packet.h> #include "etypes.h" -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include "packet-ip.h" #include "packet-ipv6.h" diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c index 89b49b6d30..5ec6b04993 100644 --- a/epan/dissectors/packet-eth.c +++ b/epan/dissectors/packet-eth.c @@ -30,7 +30,7 @@ #include <epan/packet.h> #include "prefs.h" #include "etypes.h" -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include "packet-eth.h" #include "packet-ieee8023.h" #include "packet-ipx.h" diff --git a/epan/dissectors/packet-fddi.c b/epan/dissectors/packet-fddi.c index a676f5767d..9f7cae488b 100644 --- a/epan/dissectors/packet-fddi.c +++ b/epan/dissectors/packet-fddi.c @@ -38,7 +38,7 @@ #include "packet-llc.h" #include "tap.h" -#include <epan/resolv.h> +#include <epan/addr_resolv.h> static int proto_fddi = -1; static int hf_fddi_fc = -1; diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c index d77f7c0ffe..2d62c92a61 100644 --- a/epan/dissectors/packet-icmpv6.c +++ b/epan/dissectors/packet-icmpv6.c @@ -49,7 +49,7 @@ #include "packet-ipv6.h" #include "packet-dns.h" #include "in_cksum.h" -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include "ipproto.h" #ifndef offsetof diff --git a/epan/dissectors/packet-icp.c b/epan/dissectors/packet-icp.c index 83eea14ac9..680f579567 100644 --- a/epan/dissectors/packet-icp.c +++ b/epan/dissectors/packet-icp.c @@ -35,7 +35,7 @@ #include <string.h> #include <glib.h> #include <epan/packet.h> -#include <epan/resolv.h> +#include <epan/addr_resolv.h> static int proto_icp=-1; static int hf_icp_length=-1; diff --git a/epan/dissectors/packet-icq.c b/epan/dissectors/packet-icq.c index 407abe431f..3255ecbb53 100644 --- a/epan/dissectors/packet-icq.c +++ b/epan/dissectors/packet-icq.c @@ -46,7 +46,7 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/resolv.h> +#include <epan/addr_resolv.h> static int proto_icq = -1; static int hf_icq_uin = -1; diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 41cb541cb7..32d58a9e0d 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -59,7 +59,7 @@ #include <epan/bitswap.h> #include <epan/proto.h> #include <epan/packet.h> -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include <epan/strutil.h> #include "prefs.h" #include "reassemble.h" diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c index 9a5d3e6154..7eaad3cf0a 100644 --- a/epan/dissectors/packet-ip.c +++ b/epan/dissectors/packet-ip.c @@ -35,7 +35,7 @@ #endif #include <epan/packet.h> -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include "ipproto.h" #include "ip_opts.h" #include "prefs.h" diff --git a/epan/dissectors/packet-ipsec.c b/epan/dissectors/packet-ipsec.c index 5ca0ed54dd..76defcd5bf 100644 --- a/epan/dissectors/packet-ipsec.c +++ b/epan/dissectors/packet-ipsec.c @@ -32,7 +32,7 @@ #include <glib.h> #include <epan/packet.h> #include "packet-ipsec.h" -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include "ipproto.h" #include "prefs.h" diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c index 3c0a2b6572..a22167cc80 100644 --- a/epan/dissectors/packet-ipv6.c +++ b/epan/dissectors/packet-ipv6.c @@ -35,7 +35,7 @@ #include "packet-ipsec.h" #include "packet-ipv6.h" #include "ip_opts.h" -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include "prefs.h" #include "reassemble.h" #include "ipproto.h" diff --git a/epan/dissectors/packet-ipx.c b/epan/dissectors/packet-ipx.c index 3b851d48ef..4332eac66c 100644 --- a/epan/dissectors/packet-ipx.c +++ b/epan/dissectors/packet-ipx.c @@ -36,7 +36,7 @@ #include <glib.h> #include <epan/packet.h> #include "packet-ipx.h" -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include "etypes.h" #include "ppptypes.h" #include "llcsaps.h" diff --git a/epan/dissectors/packet-isis-hello.c b/epan/dissectors/packet-isis-hello.c index f7518d5bfa..e23c6f3385 100644 --- a/epan/dissectors/packet-isis-hello.c +++ b/epan/dissectors/packet-isis-hello.c @@ -35,7 +35,7 @@ #include "packet-isis.h" #include "packet-isis-clv.h" #include "packet-isis-hello.h" -#include "epan/resolv.h" +#include "epan/addr_resolv.h" /* hello packets */ static int hf_isis_hello_circuit_reserved = -1; diff --git a/epan/dissectors/packet-isis-lsp.c b/epan/dissectors/packet-isis-lsp.c index 36d975e924..64bf8f3419 100644 --- a/epan/dissectors/packet-isis-lsp.c +++ b/epan/dissectors/packet-isis-lsp.c @@ -38,7 +38,7 @@ #include "packet-isis.h" #include "packet-isis-clv.h" #include "packet-isis-lsp.h" -#include <epan/resolv.h> +#include <epan/addr_resolv.h> /* lsp packets */ static int hf_isis_lsp_pdu_length = -1; diff --git a/epan/dissectors/packet-l2tp.c b/epan/dissectors/packet-l2tp.c index 719d8b32d3..0e82ecf5eb 100644 --- a/epan/dissectors/packet-l2tp.c +++ b/epan/dissectors/packet-l2tp.c @@ -58,7 +58,7 @@ static int hf_l2tp_tie_breaker = -1; #include <ctype.h> #include <glib.h> #include <epan/packet.h> -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #define UDP_PORT_L2TP 1701 diff --git a/epan/dissectors/packet-ldp.c b/epan/dissectors/packet-ldp.c index d4682034d0..58c14d1805 100644 --- a/epan/dissectors/packet-ldp.c +++ b/epan/dissectors/packet-ldp.c @@ -38,7 +38,7 @@ #include <glib.h> #include <string.h> #include <epan/packet.h> -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include "prefs.h" #include "afn.h" diff --git a/epan/dissectors/packet-lwapp.c b/epan/dissectors/packet-lwapp.c index ee23838bce..984cf5ff38 100644 --- a/epan/dissectors/packet-lwapp.c +++ b/epan/dissectors/packet-lwapp.c @@ -39,7 +39,7 @@ #include <epan/filesystem.h> #include "xmlstub.h" #include <epan/packet.h> -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include "prefs.h" diff --git a/epan/dissectors/packet-msproxy.c b/epan/dissectors/packet-msproxy.c index b42d1f0a22..ee8585af4f 100644 --- a/epan/dissectors/packet-msproxy.c +++ b/epan/dissectors/packet-msproxy.c @@ -50,7 +50,7 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include <epan/conversation.h> #include "packet-tcp.h" diff --git a/epan/dissectors/packet-nt-tpcp.c b/epan/dissectors/packet-nt-tpcp.c index 71d9e31085..badbc92177 100644 --- a/epan/dissectors/packet-nt-tpcp.c +++ b/epan/dissectors/packet-nt-tpcp.c @@ -37,7 +37,7 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/resolv.h> /* this is for get_hostname and get_udp_port */ +#include <epan/addr_resolv.h> /* this is for get_hostname and get_udp_port */ #define UDP_PORT_TPCP 3121 diff --git a/epan/dissectors/packet-ntp.c b/epan/dissectors/packet-ntp.c index 10c563b6e0..c8bfdd9def 100644 --- a/epan/dissectors/packet-ntp.c +++ b/epan/dissectors/packet-ntp.c @@ -41,7 +41,7 @@ #endif #include <epan/packet.h> -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include "packet-ntp.h" /* diff --git a/epan/dissectors/packet-pflog.c b/epan/dissectors/packet-pflog.c index 4f53a07f2b..0b02234189 100644 --- a/epan/dissectors/packet-pflog.c +++ b/epan/dissectors/packet-pflog.c @@ -36,7 +36,7 @@ #include <glib.h> #include <epan/packet.h> #include "etypes.h" -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include "packet-ip.h" #include "packet-ipv6.h" #include "packet-pflog.h" diff --git a/epan/dissectors/packet-pgm.c b/epan/dissectors/packet-pgm.c index 9e7a8857be..8efe72c7d6 100644 --- a/epan/dissectors/packet-pgm.c +++ b/epan/dissectors/packet-pgm.c @@ -37,7 +37,7 @@ #include "afn.h" #include "ipproto.h" #include "in_cksum.h" -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include <epan/strutil.h> #include "prefs.h" diff --git a/epan/dissectors/packet-quake3.c b/epan/dissectors/packet-quake3.c index bb8fbb3403..4bfa93e88f 100644 --- a/epan/dissectors/packet-quake3.c +++ b/epan/dissectors/packet-quake3.c @@ -45,7 +45,7 @@ #include <glib.h> #include <epan/packet.h> #include "prefs.h" -#include <epan/resolv.h> +#include <epan/addr_resolv.h> static int proto_quake3 = -1; diff --git a/epan/dissectors/packet-radius.c b/epan/dissectors/packet-radius.c index ac561d4990..63557fdd3e 100644 --- a/epan/dissectors/packet-radius.c +++ b/epan/dissectors/packet-radius.c @@ -41,7 +41,7 @@ #include "isprint.h" #include <epan/packet.h> -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include "packet-q931.h" #include "packet-gtp.h" diff --git a/epan/dissectors/packet-rtps.c b/epan/dissectors/packet-rtps.c index 6adcf73806..ac56796c1f 100644 --- a/epan/dissectors/packet-rtps.c +++ b/epan/dissectors/packet-rtps.c @@ -49,7 +49,7 @@ #include <string.h> #include <glib.h> #include <epan/packet.h> -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include <epan/conversation.h> diff --git a/epan/dissectors/packet-rx.c b/epan/dissectors/packet-rx.c index 8600c38635..245c4b8cb2 100644 --- a/epan/dissectors/packet-rx.c +++ b/epan/dissectors/packet-rx.c @@ -37,7 +37,7 @@ #include <glib.h> #include <epan/packet.h> #include "packet-rx.h" -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #define UDP_PORT_RX_LOW 7000 #define UDP_PORT_RX_HIGH 7009 diff --git a/epan/dissectors/packet-sebek.c b/epan/dissectors/packet-sebek.c index 7ba6882965..1f3e7a0fe1 100644 --- a/epan/dissectors/packet-sebek.c +++ b/epan/dissectors/packet-sebek.c @@ -41,7 +41,7 @@ #endif #include <epan/packet.h> -#include <epan/resolv.h> +#include <epan/addr_resolv.h> /* IP address: 32bit unsigned diff --git a/epan/dissectors/packet-sll.c b/epan/dissectors/packet-sll.c index d1fb2a968f..768e0c4a53 100644 --- a/epan/dissectors/packet-sll.c +++ b/epan/dissectors/packet-sll.c @@ -33,7 +33,7 @@ #include "packet-sll.h" #include "packet-ipx.h" #include "packet-llc.h" -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include "etypes.h" static int proto_sll = -1; diff --git a/epan/dissectors/packet-slowprotocols.c b/epan/dissectors/packet-slowprotocols.c index aa50a31b3a..9852931d79 100644 --- a/epan/dissectors/packet-slowprotocols.c +++ b/epan/dissectors/packet-slowprotocols.c @@ -39,7 +39,7 @@ #include "etypes.h" #include "llcsaps.h" #include "ppptypes.h" -#include <epan/resolv.h> +#include <epan/addr_resolv.h> /* Offsets of fields within a LACPDU */ diff --git a/epan/dissectors/packet-smtp.c b/epan/dissectors/packet-smtp.c index f95978411c..a2d612b0b9 100644 --- a/epan/dissectors/packet-smtp.c +++ b/epan/dissectors/packet-smtp.c @@ -36,7 +36,7 @@ #include <string.h> #include <epan/packet.h> #include <epan/conversation.h> -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include "prefs.h" #include <epan/strutil.h> diff --git a/epan/dissectors/packet-socks.c b/epan/dissectors/packet-socks.c index 502eb68a2b..e930d753a1 100644 --- a/epan/dissectors/packet-socks.c +++ b/epan/dissectors/packet-socks.c @@ -74,7 +74,7 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include <epan/conversation.h> #include "packet-tcp.h" diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index e48d7d0379..1199b6ee37 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -32,7 +32,7 @@ #include "in_cksum.h" #include <epan/packet.h> -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include "ipproto.h" #include "ip_opts.h" #include "follow.h" diff --git a/epan/dissectors/packet-teredo.c b/epan/dissectors/packet-teredo.c index f591997a69..873b908a83 100644 --- a/epan/dissectors/packet-teredo.c +++ b/epan/dissectors/packet-teredo.c @@ -37,7 +37,7 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include "ipproto.h" #include "prefs.h" diff --git a/epan/dissectors/packet-udp.c b/epan/dissectors/packet-udp.c index a905d46408..89b7b51618 100644 --- a/epan/dissectors/packet-udp.c +++ b/epan/dissectors/packet-udp.c @@ -35,7 +35,7 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include "ipproto.h" #include "in_cksum.h" #include "prefs.h" diff --git a/epan/dissectors/packet-wfleet-hdlc.c b/epan/dissectors/packet-wfleet-hdlc.c index 9c70f2d0fd..ecc8665c67 100644 --- a/epan/dissectors/packet-wfleet-hdlc.c +++ b/epan/dissectors/packet-wfleet-hdlc.c @@ -30,7 +30,7 @@ #include <glib.h> #include <epan/packet.h> #include "etypes.h" -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include "packet-chdlc.h" #include "packet-ip.h" diff --git a/epan/epan.c b/epan/epan.c index 29c3661ca7..8331113361 100644 --- a/epan/epan.c +++ b/epan/epan.c @@ -20,7 +20,7 @@ #include "packet.h" #include "column-utils.h" #include "../tap.h" -#include "resolv.h" +#include "addr_resolv.h" static void (*report_failure_func)(const char *, va_list); static void (*report_open_failure_func)(const char *, int, gboolean); diff --git a/epan/ftypes/ftype-bytes.c b/epan/ftypes/ftype-bytes.c index a2ac8a1de2..7a94012ce0 100644 --- a/epan/ftypes/ftype-bytes.c +++ b/epan/ftypes/ftype-bytes.c @@ -27,7 +27,7 @@ #include <ftypes-int.h> #include <string.h> #include <ctype.h> -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include <epan/strutil.h> #include <epan/int-64bit.h> diff --git a/epan/ftypes/ftype-integer.c b/epan/ftypes/ftype-integer.c index a807a08064..a347d88a98 100644 --- a/epan/ftypes/ftype-integer.c +++ b/epan/ftypes/ftype-integer.c @@ -27,7 +27,7 @@ #include <stdlib.h> #include <errno.h> #include "ftypes-int.h" -#include <epan/resolv.h> +#include <epan/addr_resolv.h> /* * GLib 1.2[.x] doesn't define G_MAXUINT32; if it's not defined, we define diff --git a/epan/ftypes/ftype-ipv4.c b/epan/ftypes/ftype-ipv4.c index 027fa81fcf..5a8c9a36b7 100644 --- a/epan/ftypes/ftype-ipv4.c +++ b/epan/ftypes/ftype-ipv4.c @@ -28,7 +28,7 @@ #include <ftypes-int.h> #include <epan/ipv4.h> -#include <epan/resolv.h> +#include <epan/addr_resolv.h> static void diff --git a/epan/packet.c b/epan/packet.c index cbe03dbee6..90f1eee8d4 100644 --- a/epan/packet.c +++ b/epan/packet.c @@ -48,7 +48,7 @@ #include "osi-utils.h" #include "to_str.h" -#include "resolv.h" +#include "addr_resolv.h" #include "tvbuff.h" #include "plugins.h" #include "epan_dissect.h" diff --git a/epan/proto.c b/epan/proto.c index 5ba424ed58..a017b6bc05 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -38,7 +38,7 @@ #include "packet.h" #include "strutil.h" -#include "resolv.h" +#include "addr_resolv.h" #include "plugins.h" #include "ipv6-utils.h" #include "proto.h" diff --git a/epan/to_str.c b/epan/to_str.c index 1b5c57d81d..1440bf90a4 100644 --- a/epan/to_str.c +++ b/epan/to_str.c @@ -59,7 +59,7 @@ #include "to_str.h" #include "value_string.h" -#include "resolv.h" +#include "addr_resolv.h" #include "pint.h" #include "atalk-utils.h" #include "sna-utils.h" diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c index 34f4e673d8..c7ddd64438 100644 --- a/gtk/capture_dlg.c +++ b/gtk/capture_dlg.c @@ -35,7 +35,7 @@ #include <epan/packet.h> #include "capture.h" #include "globals.h" -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include "main.h" #include "ui_util.h" #include "capture_dlg.h" diff --git a/gtk/conversations_table.c b/gtk/conversations_table.c index 009fea679c..828f46b938 100644 --- a/gtk/conversations_table.c +++ b/gtk/conversations_table.c @@ -39,7 +39,7 @@ #include "compat_macros.h" #include "epan/packet_info.h" #include "epan/to_str.h" -#include "epan/resolv.h" +#include "epan/addr_resolv.h" #include "sat.h" #include "conversations_table.h" #include "image/clist_ascend.xpm" diff --git a/gtk/file_dlg.c b/gtk/file_dlg.c index 26f36b692e..e71c58d16a 100644 --- a/gtk/file_dlg.c +++ b/gtk/file_dlg.c @@ -35,7 +35,7 @@ #include "globals.h" #include "gtkglobals.h" -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include "keys.h" #include "filter_dlg.h" #include "ui_util.h" diff --git a/gtk/follow_dlg.c b/gtk/follow_dlg.c index ce695ab82e..6b7ac28b52 100644 --- a/gtk/follow_dlg.c +++ b/gtk/follow_dlg.c @@ -55,7 +55,7 @@ #include "simple_dialog.h" #include <epan/dissectors/packet-ipv6.h> #include "prefs.h" -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include "util.h" #include "ui_util.h" #include <epan/epan_dissect.h> diff --git a/gtk/hostlist_table.c b/gtk/hostlist_table.c index 6ec42c1859..7fafc5235f 100644 --- a/gtk/hostlist_table.c +++ b/gtk/hostlist_table.c @@ -35,7 +35,7 @@ #include "compat_macros.h" #include "epan/packet_info.h" #include "epan/to_str.h" -#include "epan/resolv.h" +#include "epan/addr_resolv.h" #include "hostlist_table.h" #include "image/clist_ascend.xpm" #include "image/clist_descend.xpm" diff --git a/gtk/main.c b/gtk/main.c index 2e0ebd0634..a134653a5c 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -77,7 +77,7 @@ #include <epan/plugins.h> #include <epan/dfilter/dfilter.h> #include <epan/strutil.h> -#include <epan/resolv.h> +#include <epan/addr_resolv.h> /* general (not GTK specific) */ #include "svnversion.h" diff --git a/gtk/menu.c b/gtk/menu.c index d99a294494..b9a3f39c14 100644 --- a/gtk/menu.c +++ b/gtk/menu.c @@ -34,7 +34,7 @@ #include "menu.h" #include "tap_menu.h" #include <epan/packet.h> -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include "prefs.h" #include "about_dlg.h" #include "capture_dlg.h" diff --git a/gtk/nameres_prefs.c b/gtk/nameres_prefs.c index 262d18ffa0..04955ae56e 100644 --- a/gtk/nameres_prefs.c +++ b/gtk/nameres_prefs.c @@ -31,7 +31,7 @@ #include "globals.h" #include "nameres_prefs.h" #include "gtkglobals.h" -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include "prefs.h" #include "prefs_dlg.h" #include "ui_util.h" diff --git a/gtk/packet_win.c b/gtk/packet_win.c index cc232b56c6..38eb1d493c 100644 --- a/gtk/packet_win.c +++ b/gtk/packet_win.c @@ -50,7 +50,7 @@ #include "../menu.h" #include "column.h" #include "print.h" -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include "packet_win.h" #include "simple_dialog.h" #include "proto_draw.h" @@ -34,7 +34,7 @@ #include "ipproto.h" #include <epan/packet.h> -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include <epan/dissectors/packet-ip.h> #ifdef NEED_SNPRINTF_H diff --git a/plugins/acn/packet-acn.c b/plugins/acn/packet-acn.c index cd749e826e..d328f79c84 100644 --- a/plugins/acn/packet-acn.c +++ b/plugins/acn/packet-acn.c @@ -42,7 +42,7 @@ #include <time.h> #include <string.h> #include <epan/packet.h> -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include "prefs.h" #include <epan/strutil.h> diff --git a/plugins/artnet/packet-artnet.c b/plugins/artnet/packet-artnet.c index d1649b63ac..4b01dbe845 100644 --- a/plugins/artnet/packet-artnet.c +++ b/plugins/artnet/packet-artnet.c @@ -41,7 +41,7 @@ #include <time.h> #include <string.h> #include <epan/packet.h> -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include "prefs.h" #include <epan/strutil.h> diff --git a/plugins/asn1/packet-asn1.c b/plugins/asn1/packet-asn1.c index 74fc9f0332..6b94f7966a 100644 --- a/plugins/asn1/packet-asn1.c +++ b/plugins/asn1/packet-asn1.c @@ -78,7 +78,7 @@ #include <time.h> #include <string.h> #include <epan/packet.h> -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include "prefs.h" #include <epan/strutil.h> #include <epan/filesystem.h> diff --git a/plugins/enttec/packet-enttec.c b/plugins/enttec/packet-enttec.c index 6660892f8c..aed64e4c6c 100644 --- a/plugins/enttec/packet-enttec.c +++ b/plugins/enttec/packet-enttec.c @@ -41,7 +41,7 @@ #include <time.h> #include <string.h> #include <epan/packet.h> -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include "prefs.h" #include <epan/strutil.h> diff --git a/plugins/megaco/packet-megaco.c b/plugins/megaco/packet-megaco.c index c7ea7fb52e..df17e3b4ab 100644 --- a/plugins/megaco/packet-megaco.c +++ b/plugins/megaco/packet-megaco.c @@ -45,7 +45,7 @@ #include <time.h> #include <string.h> #include <epan/packet.h> -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include "prefs.h" #include <epan/strutil.h> #include "sctpppids.h" diff --git a/plugins/mgcp/packet-mgcp.c b/plugins/mgcp/packet-mgcp.c index 0df25e6199..2c163d368f 100644 --- a/plugins/mgcp/packet-mgcp.c +++ b/plugins/mgcp/packet-mgcp.c @@ -49,7 +49,7 @@ #include <time.h> #include <string.h> #include <epan/packet.h> -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include "prefs.h" #include <epan/strutil.h> #include <epan/conversation.h> diff --git a/plugins/pcli/packet-pcli.c b/plugins/pcli/packet-pcli.c index 16e121444d..2edbbe016e 100644 --- a/plugins/pcli/packet-pcli.c +++ b/plugins/pcli/packet-pcli.c @@ -44,7 +44,7 @@ #include <time.h> #include <string.h> #include <epan/packet.h> -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include "prefs.h" #include <epan/strutil.h> diff --git a/plugins/rdm/packet-rdm.c b/plugins/rdm/packet-rdm.c index ee49155d10..079ed4985b 100644 --- a/plugins/rdm/packet-rdm.c +++ b/plugins/rdm/packet-rdm.c @@ -41,7 +41,7 @@ #include <time.h> #include <string.h> #include <epan/packet.h> -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include "etypes.h" #include <epan/strutil.h> diff --git a/plugins/rtnet/packet-rtnet.c b/plugins/rtnet/packet-rtnet.c index b1065e9912..544b9da74c 100644 --- a/plugins/rtnet/packet-rtnet.c +++ b/plugins/rtnet/packet-rtnet.c @@ -41,7 +41,7 @@ #include <time.h> #include <string.h> #include <epan/packet.h> -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include "etypes.h" #include <epan/strutil.h> diff --git a/plugins/v5ua/packet-v5ua.c b/plugins/v5ua/packet-v5ua.c index 435ee41332..2ff3a44971 100644 --- a/plugins/v5ua/packet-v5ua.c +++ b/plugins/v5ua/packet-v5ua.c @@ -48,7 +48,7 @@ G_MODULE_EXPORT const gchar version[] = VERSION; #include <ctype.h> #include <epan/packet.h> -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include <epan/strutil.h> #include "sctpppids.h" /* include V5UA payload protocol ID */ @@ -39,7 +39,7 @@ #include <epan/filesystem.h> #include "globals.h" -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include <epan/packet.h> #include "file.h" #include "prefs.h" diff --git a/tap-iousers.c b/tap-iousers.c index 2fe4fabd6c..2b33458012 100644 --- a/tap-iousers.c +++ b/tap-iousers.c @@ -35,7 +35,7 @@ #include <string.h> #include <epan/packet_info.h> #include <epan/packet.h> -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include "tap.h" #include "register.h" #include <epan/dissectors/packet-ip.h> diff --git a/tethereal.c b/tethereal.c index 829bd6bc03..f2b5db166b 100644 --- a/tethereal.c +++ b/tethereal.c @@ -86,7 +86,7 @@ #include "prefs.h" #include "column.h" #include "print.h" -#include <epan/resolv.h> +#include <epan/addr_resolv.h> #include "util.h" #include "version_info.h" #ifdef HAVE_LIBPCAP @@ -56,7 +56,7 @@ typedef int mode_t; /* for win32 */ #endif /* __MINGW32__ */ #endif /* HAVE_IO_H */ -#include <epan/resolv.h> +#include <epan/addr_resolv.h> /* * This has to come after the include of <pcap.h>, as the include of |