[Albert Chin <ethereal-dev@xxxxxxxxxxxxxxxxxxxxxxxxx>]

Tru64 UNIX has <resolv.h>. This conflicts with epan/resolv.h.
<netdb.h> contains the following:
  #if defined(_REENTRANT) || defined(_THREAD_SAFE)

  #include <arpa/nameser.h>
  #include <resolv.h>

So, the <resolv.h> from epan is pulled in. However, what we want is
/usr/include/resolv.h. This error was never encountered in a
GTK1-build because GTK2 has thread support and sets CFLAGS=-pthread
for Tru64 (which enables -D_REENTRANT).

There are two solutions:
  1. Reference all .h files in epan with ./[file] and don't -I.
     while in epan.
  2. Rename epan/resolv.[ch].

The patch below implements #2. I haven't included the patches that
rename epan/resolv.[ch] -> epan/inet_resolv.[ch].

-- 
albert chin (china@xxxxxxxxxxxxxxxxxx)

-- snip snip
--- epan/Makefile.am.orig	2004-06-26 11:04:52.000000000 -0500
+++ epan/Makefile.am	2004-08-03 10:29:47.000000000 -0500
@@ -35,6 +35,7 @@
 include Makefile.common
 
 INCLUDES = -I$(srcdir)/..
+DEFS = @DEFS@ -DDATAFILE_DIR=\"$(datadir)\"
 
 libethereal_la_SOURCES = \
 	addr_and_mask.c		\
@@ -61,6 +62,8 @@
 	frame_data.c		\
 	frame_data.h		\
 	gdebug.h		\
+	inet_resolv.c		\
+	inet_resolv.h		\
 	int-64bit.c		\
 	int-64bit.h		\
 	ipv4.c			\
@@ -77,8 +80,6 @@
 	plugins.h		\
 	proto.c			\
 	proto.h			\
-	resolv.c		\
-	resolv.h		\
 	report_err.h		\
 	slab.h			\
 	sna-utils.c		\
--- epan/ftypes/ftype-bytes.c.orig	2004-08-03 10:32:42.000000000 -0500
+++ epan/ftypes/ftype-bytes.c	2004-08-03 10:33:06.000000000 -0500
@@ -27,7 +27,7 @@
 #include <ftypes-int.h>
 #include <string.h>
 #include <ctype.h>
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 #include <epan/strutil.h>
 #include <epan/int-64bit.h>
 
--- epan/ftypes/ftype-integer.c.orig	2004-08-03 10:32:45.000000000 -0500
+++ epan/ftypes/ftype-integer.c	2004-08-03 10:33:08.000000000 -0500
@@ -27,7 +27,7 @@
 #include <stdlib.h>
 #include <errno.h>
 #include "ftypes-int.h"
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 
 
 static void
--- epan/ftypes/ftype-ipv4.c.orig	2004-08-03 10:32:49.000000000 -0500
+++ epan/ftypes/ftype-ipv4.c	2004-08-03 10:33:09.000000000 -0500
@@ -28,7 +28,7 @@
 
 #include <ftypes-int.h>
 #include <epan/ipv4.h>
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 
 
 static void
--- epan/epan.c.orig	2004-08-03 10:28:08.000000000 -0500
+++ epan/epan.c	2004-08-03 10:28:36.000000000 -0500
@@ -20,7 +20,7 @@
 #include "packet.h"
 #include "column-utils.h"
 #include "../tap.h"
-#include "resolv.h"
+#include "inet_resolv.h"
 
 static void (*report_failure_func)(const char *, va_list);
 static void (*report_open_failure_func)(const char *, int, gboolean);
--- epan/packet.c.orig	2004-08-03 10:28:12.000000000 -0500
+++ epan/packet.c	2004-08-03 10:28:38.000000000 -0500
@@ -48,7 +48,7 @@
 #include "osi-utils.h"
 #include "to_str.h"
 
-#include "resolv.h"
+#include "inet_resolv.h"
 #include "tvbuff.h"
 #include "plugins.h"
 #include "epan_dissect.h"
--- epan/proto.c.orig	2004-08-03 10:28:15.000000000 -0500
+++ epan/proto.c	2004-08-03 10:28:40.000000000 -0500
@@ -38,7 +38,7 @@
 
 #include "packet.h"
 #include "strutil.h"
-#include "resolv.h"
+#include "inet_resolv.h"
 #include "plugins.h"
 #include "ipv6-utils.h"
 #include "proto.h"
--- epan/to_str.c.orig	2004-08-03 10:28:17.000000000 -0500
+++ epan/to_str.c	2004-08-03 10:28:41.000000000 -0500
@@ -59,7 +59,7 @@
 
 #include "to_str.h"
 #include "value_string.h"
-#include "resolv.h"
+#include "inet_resolv.h"
 #include "pint.h"
 #include "atalk-utils.h"
 #include "sna-utils.h"
--- epan/column-utils.c.orig	2004-08-03 11:44:12.000000000 -0500
+++ epan/column-utils.c	2004-08-03 11:44:19.000000000 -0500
@@ -40,7 +40,7 @@
 #include "to_str.h"
 #include "packet_info.h"
 #include "pint.h"
-#include "resolv.h"
+#include "inet_resolv.h"
 #include "ipv6-utils.h"
 #include "osi-utils.h"
 #include "value_string.h"
--- gtk/main.c.orig	2004-07-13 00:31:08.000000000 -0500
+++ gtk/main.c	2004-08-03 11:29:01.000000000 -0500
@@ -1,6 +1,6 @@
 /* main.c
  *
- * $Id: main.c,v 1.454 2004/07/07 16:31:30 ulfl Exp $
+ * $Id: main.c,v 1.457 2004/07/12 19:10:58 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@xxxxxxxxxxxx>
@@ -77,7 +77,7 @@
 #include <epan/plugins.h>
 #include <epan/dfilter/dfilter.h>
 #include <epan/strutil.h>
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 
 /* general (not GTK specific) */
 #include "cvsversion.h"
--- gtk/capture_dlg.c.orig	2004-08-03 11:27:29.000000000 -0500
+++ gtk/capture_dlg.c	2004-08-03 11:28:18.000000000 -0500
@@ -35,7 +35,7 @@
 #include <epan/packet.h>
 #include "capture.h"
 #include "globals.h"
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 #include "main.h"
 #include "ui_util.h"
 #include "capture_dlg.h"
--- gtk/endpoint_talkers_table.c.orig	2004-08-03 11:27:32.000000000 -0500
+++ gtk/endpoint_talkers_table.c	2004-08-03 11:28:19.000000000 -0500
@@ -39,7 +39,7 @@
 #include "compat_macros.h"
 #include "epan/packet_info.h"
 #include "epan/to_str.h"
-#include "epan/resolv.h"
+#include "epan/inet_resolv.h"
 #include "sat.h"
 #include "endpoint_talkers_table.h"
 #include "image/clist_ascend.xpm"
--- gtk/file_dlg.c.orig	2004-08-03 11:27:36.000000000 -0500
+++ gtk/file_dlg.c	2004-08-03 11:28:21.000000000 -0500
@@ -35,7 +35,7 @@
 
 #include "globals.h"
 #include "gtkglobals.h"
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 #include "keys.h"
 #include "filter_prefs.h"
 #include "ui_util.h"
--- gtk/follow_dlg.c.orig	2004-08-03 11:27:40.000000000 -0500
+++ gtk/follow_dlg.c	2004-08-03 11:28:23.000000000 -0500
@@ -53,7 +53,7 @@
 #include "simple_dialog.h"
 #include "packet-ipv6.h"
 #include "prefs.h"
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 #include "util.h"
 #include "ui_util.h"
 #include <epan/epan_dissect.h>
--- gtk/hostlist_table.c.orig	2004-08-03 11:27:43.000000000 -0500
+++ gtk/hostlist_table.c	2004-08-03 11:28:25.000000000 -0500
@@ -35,7 +35,7 @@
 #include "compat_macros.h"
 #include "epan/packet_info.h"
 #include "epan/to_str.h"
-#include "epan/resolv.h"
+#include "epan/inet_resolv.h"
 #include "hostlist_table.h"
 #include "image/clist_ascend.xpm"
 #include "image/clist_descend.xpm"
--- gtk/menu.c.orig	2004-08-03 11:27:55.000000000 -0500
+++ gtk/menu.c	2004-08-03 11:28:33.000000000 -0500
@@ -34,7 +34,7 @@
 #include "menu.h"
 #include "tap_menu.h"
 #include <epan/packet.h>
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 #include "prefs.h"
 #include "about_dlg.h"
 #include "capture_dlg.h"
--- gtk/nameres_prefs.c.orig	2004-08-03 11:27:58.000000000 -0500
+++ gtk/nameres_prefs.c	2004-08-03 11:28:35.000000000 -0500
@@ -31,7 +31,7 @@
 #include "globals.h"
 #include "nameres_prefs.h"
 #include "gtkglobals.h"
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 #include "prefs.h"
 #include "prefs_dlg.h"
 #include "ui_util.h"
--- gtk/packet_win.c.orig	2004-08-03 11:28:02.000000000 -0500
+++ gtk/packet_win.c	2004-08-03 11:28:37.000000000 -0500
@@ -50,7 +50,7 @@
 #include "../menu.h"
 #include "column.h"
 #include "print.h"
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 #include "packet_win.h"
 #include "simple_dialog.h"
 #include "proto_draw.h"
--- plugins/acn/packet-acn.c.orig	2004-08-03 11:06:46.000000000 -0500
+++ plugins/acn/packet-acn.c	2004-08-03 11:06:52.000000000 -0500
@@ -42,7 +42,7 @@
 #include <time.h>
 #include <string.h>
 #include <epan/packet.h>
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 #include "prefs.h"
 #include <epan/strutil.h>
 
--- plugins/artnet/packet-artnet.c.orig	2004-08-03 11:19:11.000000000 -0500
+++ plugins/artnet/packet-artnet.c	2004-08-03 11:19:57.000000000 -0500
@@ -41,7 +41,7 @@
 #include <time.h>
 #include <string.h>
 #include <epan/packet.h>
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 #include "prefs.h"
 #include <epan/strutil.h>
 
--- plugins/asn1/packet-asn1.c.orig	2004-08-03 11:19:14.000000000 -0500
+++ plugins/asn1/packet-asn1.c	2004-08-03 11:19:59.000000000 -0500
@@ -78,7 +78,7 @@
 #include <time.h>
 #include <string.h>
 #include <epan/packet.h>
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 #include "prefs.h"
 #include <epan/strutil.h>
 #include <epan/filesystem.h>
--- plugins/enttec/packet-enttec.c.orig	2004-08-03 11:19:17.000000000 -0500
+++ plugins/enttec/packet-enttec.c	2004-08-03 11:20:00.000000000 -0500
@@ -41,7 +41,7 @@
 #include <time.h>
 #include <string.h>
 #include <epan/packet.h>
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 #include "prefs.h"
 #include <epan/strutil.h>
 
--- plugins/megaco/packet-megaco.c.orig	2004-08-03 11:19:20.000000000 -0500
+++ plugins/megaco/packet-megaco.c	2004-08-03 11:20:02.000000000 -0500
@@ -45,7 +45,7 @@
 #include <time.h>
 #include <string.h>
 #include <epan/packet.h>
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 #include "prefs.h"
 #include <epan/strutil.h>
 #include "sctpppids.h"
--- plugins/mgcp/packet-mgcp.c.orig	2004-08-03 11:19:23.000000000 -0500
+++ plugins/mgcp/packet-mgcp.c	2004-08-03 11:20:03.000000000 -0500
@@ -49,7 +49,7 @@
 #include <time.h>
 #include <string.h>
 #include <epan/packet.h>
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 #include "prefs.h"
 #include <epan/strutil.h>
 #include <epan/conversation.h>
--- plugins/pcli/packet-pcli.c.orig	2004-08-03 11:19:26.000000000 -0500
+++ plugins/pcli/packet-pcli.c	2004-08-03 11:20:05.000000000 -0500
@@ -44,7 +44,7 @@
 #include <time.h>
 #include <string.h>
 #include <epan/packet.h>
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 #include "prefs.h"
 #include <epan/strutil.h>
 
--- plugins/rdm/packet-rdm.c.orig	2004-08-03 11:19:29.000000000 -0500
+++ plugins/rdm/packet-rdm.c	2004-08-03 11:20:07.000000000 -0500
@@ -41,7 +41,7 @@
 #include <time.h>
 #include <string.h>
 #include <epan/packet.h>
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 #include "etypes.h"
 #include <epan/strutil.h>
 
--- plugins/rtnet/packet-rtnet.c.orig	2004-08-03 11:19:32.000000000 -0500
+++ plugins/rtnet/packet-rtnet.c	2004-08-03 11:20:08.000000000 -0500
@@ -41,7 +41,7 @@
 #include <time.h>
 #include <string.h>
 #include <epan/packet.h>
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 #include "etypes.h"
 #include <epan/strutil.h>
 
--- plugins/v5ua/packet-v5ua.c.orig	2004-08-03 11:19:36.000000000 -0500
+++ plugins/v5ua/packet-v5ua.c	2004-08-03 11:20:10.000000000 -0500
@@ -48,7 +48,7 @@
 
 #include <ctype.h>
 #include <epan/packet.h>
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 #include <epan/strutil.h>
 #include "sctpppids.h"      /* include V5UA payload protocol ID */
 
--- packet-eigrp.c.orig	2004-08-03 10:47:04.000000000 -0500
+++ packet-eigrp.c	2004-08-03 10:47:04.000000000 -0500
@@ -29,7 +29,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 
 #include <epan/atalk-utils.h>
 #include <epan/addr_and_mask.h>
--- packet-eth.c.orig	2004-08-03 10:47:04.000000000 -0500
+++ packet-eth.c	2004-08-03 10:47:04.000000000 -0500
@@ -30,7 +30,7 @@
 #include <epan/packet.h>
 #include "prefs.h"
 #include "etypes.h"
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 #include "packet-eth.h"
 #include "packet-ieee8023.h"
 #include "packet-ipx.h"
--- packet-enc.c.orig	2004-08-03 10:47:04.000000000 -0500
+++ packet-enc.c	2004-08-03 10:47:04.000000000 -0500
@@ -31,7 +31,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include "etypes.h"
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 #include "packet-ip.h"
 #include "packet-ipv6.h"
 
--- packet-dns.c.orig	2004-08-03 10:47:04.000000000 -0500
+++ packet-dns.c	2004-08-03 10:47:04.000000000 -0500
@@ -38,7 +38,7 @@
 #include <epan/ipv6-utils.h>
 #include <epan/packet.h>
 #include "ipproto.h"
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 #include "packet-dns.h"
 #include "packet-tcp.h"
 #include "prefs.h"
--- packet-bpdu.c.orig	2004-08-03 10:47:03.000000000 -0500
+++ packet-bpdu.c	2004-08-03 10:47:03.000000000 -0500
@@ -35,7 +35,7 @@
 #include "llcsaps.h"
 #include "ppptypes.h"
 #include "chdlctypes.h"
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 
 /* Offsets of fields within a BPDU */
 
--- packet-icmpv6.c.orig	2004-08-03 10:47:05.000000000 -0500
+++ packet-icmpv6.c	2004-08-03 10:47:05.000000000 -0500
@@ -49,7 +49,7 @@
 #include "packet-ipv6.h"
 #include "packet-dns.h"
 #include "in_cksum.h"
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 #include "ipproto.h"
 
 #ifndef offsetof
--- packet-socks.c.orig	2004-08-03 10:47:09.000000000 -0500
+++ packet-socks.c	2004-08-03 10:47:09.000000000 -0500
@@ -74,7 +74,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 #include <epan/conversation.h>
 
 #include "packet-tcp.h"
--- packet-tcp.c.orig	2004-08-03 10:47:09.000000000 -0500
+++ packet-tcp.c	2004-08-03 10:47:09.000000000 -0500
@@ -32,7 +32,7 @@
 #include "in_cksum.h"
 
 #include <epan/packet.h>
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 #include "ipproto.h"
 #include "ip_opts.h"
 #include "follow.h"
--- packet-teredo.c.orig	2004-08-03 10:47:09.000000000 -0500
+++ packet-teredo.c	2004-08-03 10:47:09.000000000 -0500
@@ -37,7 +37,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 #include "ipproto.h"
 #include "prefs.h"
 
--- packet-udp.c.orig	2004-08-03 10:47:09.000000000 -0500
+++ packet-udp.c	2004-08-03 10:47:10.000000000 -0500
@@ -35,7 +35,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 #include "ipproto.h"
 #include "in_cksum.h"
 #include "prefs.h"
--- packet-wfleet-hdlc.c.orig	2004-08-03 10:47:10.000000000 -0500
+++ packet-wfleet-hdlc.c	2004-08-03 10:47:10.000000000 -0500
@@ -30,7 +30,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include "etypes.h"
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 #include "packet-chdlc.h"
 #include "packet-ip.h"
 
--- prefs.c.orig	2004-08-03 10:47:10.000000000 -0500
+++ prefs.c	2004-08-03 10:47:10.000000000 -0500
@@ -39,7 +39,7 @@
 
 #include <epan/filesystem.h>
 #include "globals.h"
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 #include <epan/packet.h>
 #include "file.h"
 #include "prefs.h"
--- tap-iousers.c.orig	2004-08-03 10:47:10.000000000 -0500
+++ tap-iousers.c	2004-08-03 10:47:10.000000000 -0500
@@ -35,7 +35,7 @@
 #include <string.h>
 #include <epan/packet_info.h>
 #include <epan/packet.h>
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 #include "tap.h"
 #include "register.h"
 #include "packet-ip.h"
--- util.c.orig	2004-08-03 10:47:10.000000000 -0500
+++ util.c	2004-08-03 10:47:10.000000000 -0500
@@ -56,7 +56,7 @@
 #endif /* __MINGW32__ */
 #endif /* HAVE_IO_H */
 
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 
 /*
  * This has to come after the include of <pcap.h>, as the include of
--- packet-diameter.c.orig	2004-08-03 10:47:04.000000000 -0500
+++ packet-diameter.c	2004-08-03 10:47:04.000000000 -0500
@@ -47,7 +47,7 @@
 #include <epan/filesystem.h>
 #include "xmlstub.h"
 #include <epan/packet.h>
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 #include <epan/report_err.h>
 #include "prefs.h"
 #include "packet-tcp.h"
--- packet-dec-bpdu.c.orig	2004-08-03 10:47:04.000000000 -0500
+++ packet-dec-bpdu.c	2004-08-03 10:47:04.000000000 -0500
@@ -32,7 +32,7 @@
 #include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 #include "etypes.h"
 #include "ppptypes.h"
 
--- packet-chdlc.c.orig	2004-08-03 10:47:03.000000000 -0500
+++ packet-chdlc.c	2004-08-03 10:47:03.000000000 -0500
@@ -31,7 +31,7 @@
 #include "etypes.h"
 #include "prefs.h"
 #include "chdlctypes.h"
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 #include "packet-chdlc.h"
 #include "packet-ppp.h"
 #include "packet-ip.h"
--- packet-fddi.c.orig	2004-08-03 10:47:04.000000000 -0500
+++ packet-fddi.c	2004-08-03 10:47:05.000000000 -0500
@@ -38,7 +38,7 @@
 #include "packet-llc.h"
 #include "tap.h"
 
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 
 static int proto_fddi = -1;
 static int hf_fddi_fc = -1;
--- tethereal.c.orig	2004-08-03 10:47:10.000000000 -0500
+++ tethereal.c	2004-08-03 10:47:10.000000000 -0500
@@ -86,7 +86,7 @@
 #include "prefs.h"
 #include "column.h"
 #include "print.h"
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 #include "util.h"
 #include "version_info.h"
 #ifdef HAVE_LIBPCAP
--- packet-beep.c.orig	2004-08-03 10:47:03.000000000 -0500
+++ packet-beep.c	2004-08-03 10:47:03.000000000 -0500
@@ -39,7 +39,7 @@
 #include <glib.h>
 #include <string.h>
 #include <epan/packet.h>
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 #include "prefs.h"
 #include <epan/conversation.h>
 
--- packet-auto_rp.c.orig	2004-08-03 10:47:03.000000000 -0500
+++ packet-auto_rp.c	2004-08-03 10:47:03.000000000 -0500
@@ -32,7 +32,7 @@
 #include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 
 static gint proto_auto_rp = -1;
 static gint ett_auto_rp = -1;
--- packet-icp.c.orig	2004-08-03 10:47:05.000000000 -0500
+++ packet-icp.c	2004-08-03 10:47:05.000000000 -0500
@@ -35,7 +35,7 @@
 #include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 
 static int proto_icp=-1;
 static int hf_icp_length=-1;
--- packet-icq.c.orig	2004-08-03 10:47:05.000000000 -0500
+++ packet-icq.c	2004-08-03 10:47:05.000000000 -0500
@@ -46,7 +46,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 
 static int proto_icq = -1;
 static int hf_icq_uin = -1;
--- packet-ieee80211.c.orig	2004-08-03 10:47:05.000000000 -0500
+++ packet-ieee80211.c	2004-08-03 10:47:05.000000000 -0500
@@ -59,7 +59,7 @@
 #include <epan/bitswap.h>
 #include <epan/proto.h>
 #include <epan/packet.h>
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 #include <epan/strutil.h>
 #include "prefs.h"
 #include "reassemble.h"
--- packet-rx.c.orig	2004-08-03 10:47:08.000000000 -0500
+++ packet-rx.c	2004-08-03 10:47:08.000000000 -0500
@@ -37,7 +37,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-rx.h"
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 
 #define UDP_PORT_RX_LOW		7000
 #define UDP_PORT_RX_HIGH	7009
--- packet-sebek.c.orig	2004-08-03 10:47:08.000000000 -0500
+++ packet-sebek.c	2004-08-03 10:47:09.000000000 -0500
@@ -41,7 +41,7 @@
 #endif
 
 #include <epan/packet.h>
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 
 /*
         IP address:     32bit unsigned
--- packet-sll.c.orig	2004-08-03 10:47:09.000000000 -0500
+++ packet-sll.c	2004-08-03 10:47:09.000000000 -0500
@@ -33,7 +33,7 @@
 #include "packet-sll.h"
 #include "packet-ipx.h"
 #include "packet-llc.h"
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 #include "etypes.h"
 
 static int proto_sll = -1;
--- packet-slowprotocols.c.orig	2004-08-03 10:47:09.000000000 -0500
+++ packet-slowprotocols.c	2004-08-03 10:47:09.000000000 -0500
@@ -39,7 +39,7 @@
 #include "etypes.h"
 #include "llcsaps.h"
 #include "ppptypes.h"
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 
 /* Offsets of fields within a LACPDU */
 
--- packet-smtp.c.orig	2004-08-03 10:47:09.000000000 -0500
+++ packet-smtp.c	2004-08-03 10:47:09.000000000 -0500
@@ -36,7 +36,7 @@
 #include <string.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 #include "prefs.h"
 #include <epan/strutil.h>
 
--- packet-atm.c.orig	2004-08-03 10:47:03.000000000 -0500
+++ packet-atm.c	2004-08-03 10:47:03.000000000 -0500
@@ -30,7 +30,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include "oui.h"
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 
 #include "packet-atm.h"
 #include "packet-snmp.h"
--- packet-ip.c.orig	2004-08-03 10:47:05.000000000 -0500
+++ packet-ip.c	2004-08-03 10:47:05.000000000 -0500
@@ -35,7 +35,7 @@
 #endif
 
 #include <epan/packet.h>
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 #include "ipproto.h"
 #include "ip_opts.h"
 #include "prefs.h"
--- packet-ipsec.c.orig	2004-08-03 10:47:06.000000000 -0500
+++ packet-ipsec.c	2004-08-03 10:47:06.000000000 -0500
@@ -32,7 +32,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-ipsec.h"
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 #include "ipproto.h"
 #include "prefs.h"
 
--- packet-ipv6.c.orig	2004-08-03 10:47:06.000000000 -0500
+++ packet-ipv6.c	2004-08-03 10:47:06.000000000 -0500
@@ -35,7 +35,7 @@
 #include "packet-ipsec.h"
 #include "packet-ipv6.h"
 #include "ip_opts.h"
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 #include "prefs.h"
 #include "reassemble.h"
 #include "ipproto.h"
--- packet-pflog.c.orig	2004-08-03 10:47:07.000000000 -0500
+++ packet-pflog.c	2004-08-03 10:47:07.000000000 -0500
@@ -36,7 +36,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include "etypes.h"
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 #include "packet-ip.h"
 #include "packet-ipv6.h"
 #include "packet-pflog.h"
--- packet-pgm.c.orig	2004-08-03 10:47:07.000000000 -0500
+++ packet-pgm.c	2004-08-03 10:47:08.000000000 -0500
@@ -37,7 +37,7 @@
 #include "afn.h"
 #include "ipproto.h"
 #include "in_cksum.h"
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 #include <epan/strutil.h>
 #include "prefs.h"
 
--- packet-quake3.c.orig	2004-08-03 10:47:08.000000000 -0500
+++ packet-quake3.c	2004-08-03 10:47:08.000000000 -0500
@@ -45,7 +45,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include "prefs.h"
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 
 static int proto_quake3 = -1;
 
--- packet-radius.c.orig	2004-08-03 10:47:08.000000000 -0500
+++ packet-radius.c	2004-08-03 10:47:08.000000000 -0500
@@ -38,7 +38,7 @@
 #include <glib.h>
 #include <time.h>
 #include <epan/packet.h>
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 
 #include "packet-q931.h"
 #include "packet-gtp.h"
--- packet-rtps.c.orig	2004-08-03 10:47:08.000000000 -0500
+++ packet-rtps.c	2004-08-03 10:47:08.000000000 -0500
@@ -49,7 +49,7 @@
 #include  <string.h>
 #include  <glib.h>
 #include  <epan/packet.h>
-#include  <epan/resolv.h>
+#include  <epan/inet_resolv.h>
 #include  <epan/conversation.h>
 
 
--- packet-ap1394.c.orig	2004-08-03 10:47:02.000000000 -0500
+++ packet-ap1394.c	2004-08-03 10:47:03.000000000 -0500
@@ -28,7 +28,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 #include <epan/strutil.h>
 
 #include "packet-ap1394.h"
--- packet-arp.c.orig	2004-08-03 10:47:03.000000000 -0500
+++ packet-arp.c	2004-08-03 10:47:03.000000000 -0500
@@ -30,7 +30,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/strutil.h>
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 #include "packet-arp.h"
 #include "etypes.h"
 #include "arcnet_pids.h"
--- packet-afs.c.orig	2004-08-03 10:47:02.000000000 -0500
+++ packet-afs.c	2004-08-03 10:47:02.000000000 -0500
@@ -41,7 +41,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 
 #include "packet-rx.h"
 #include "packet-afs.h"
--- ipproto.c.orig	2004-08-03 10:47:02.000000000 -0500
+++ ipproto.c	2004-08-03 10:47:02.000000000 -0500
@@ -34,7 +34,7 @@
 
 #include "ipproto.h"
 #include <epan/packet.h>
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 #include "packet-ip.h"
 
 #ifdef NEED_SNPRINTF_H
--- packet-ipx.c.orig	2004-08-03 10:47:06.000000000 -0500
+++ packet-ipx.c	2004-08-03 10:47:06.000000000 -0500
@@ -36,7 +36,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-ipx.h"
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 #include "etypes.h"
 #include "ppptypes.h"
 #include "llcsaps.h"
--- packet-isis-hello.c.orig	2004-08-03 10:47:06.000000000 -0500
+++ packet-isis-hello.c	2004-08-03 10:51:59.000000000 -0500
@@ -35,7 +35,7 @@
 #include "packet-isis.h"
 #include "packet-isis-clv.h"
 #include "packet-isis-hello.h"
-#include "epan/resolv.h"
+#include "epan/inet_resolv.h"
 
 /* hello packets */
 static int hf_isis_hello_circuit_reserved = -1;
--- packet-isis-lsp.c.orig	2004-08-03 10:47:06.000000000 -0500
+++ packet-isis-lsp.c	2004-08-03 10:47:06.000000000 -0500
@@ -38,7 +38,7 @@
 #include "packet-isis.h"
 #include "packet-isis-clv.h"
 #include "packet-isis-lsp.h"
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 
 /* lsp packets */
 static int hf_isis_lsp_pdu_length = -1;
--- packet-l2tp.c.orig	2004-08-03 10:47:06.000000000 -0500
+++ packet-l2tp.c	2004-08-03 10:47:06.000000000 -0500
@@ -58,7 +58,7 @@
 #include <ctype.h>
 #include <glib.h>
 #include <epan/packet.h>
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 
 #define UDP_PORT_L2TP   1701
 
--- packet-ldp.c.orig	2004-08-03 10:47:07.000000000 -0500
+++ packet-ldp.c	2004-08-03 10:47:07.000000000 -0500
@@ -38,7 +38,7 @@
 #include <glib.h>
 #include <string.h>
 #include <epan/packet.h>
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 #include "prefs.h"
 #include "afn.h"
 
--- packet-lwapp.c.orig	2004-08-03 10:47:07.000000000 -0500
+++ packet-lwapp.c	2004-08-03 10:47:07.000000000 -0500
@@ -39,7 +39,7 @@
 #include <epan/filesystem.h>
 #include "xmlstub.h"
 #include <epan/packet.h>
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 #include "prefs.h"
 
 
--- packet-msproxy.c.orig	2004-08-03 10:47:07.000000000 -0500
+++ packet-msproxy.c	2004-08-03 10:47:07.000000000 -0500
@@ -50,7 +50,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 #include <epan/conversation.h>
 
 #include "packet-tcp.h"
--- packet-nt-tpcp.c.orig	2004-08-03 10:47:07.000000000 -0500
+++ packet-nt-tpcp.c	2004-08-03 10:47:07.000000000 -0500
@@ -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/inet_resolv.h> /* this is for get_hostname and get_udp_port */
 
 #define UDP_PORT_TPCP   3121 
 
--- packet-ntp.c.orig	2004-08-03 10:47:07.000000000 -0500
+++ packet-ntp.c	2004-08-03 10:47:07.000000000 -0500
@@ -41,7 +41,7 @@
 #endif
 
 #include <epan/packet.h>
-#include <epan/resolv.h>
+#include <epan/inet_resolv.h>
 #include "packet-ntp.h"
 
 /*