aboutsummaryrefslogtreecommitdiffstats
path: root/gtk
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2004-08-06 19:57:49 +0000
committerGuy Harris <guy@alum.mit.edu>2004-08-06 19:57:49 +0000
commit3a583aeb59d627fa6ed3221e7214d7989d98be32 (patch)
tree82d8efc2349c5298877c38219c13ba063494bc97 /gtk
parentdbe1fe229ef63b40fdffcbc15dbee2c2575de8ee (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
Diffstat (limited to 'gtk')
-rw-r--r--gtk/capture_dlg.c2
-rw-r--r--gtk/conversations_table.c2
-rw-r--r--gtk/file_dlg.c2
-rw-r--r--gtk/follow_dlg.c2
-rw-r--r--gtk/hostlist_table.c2
-rw-r--r--gtk/main.c2
-rw-r--r--gtk/menu.c2
-rw-r--r--gtk/nameres_prefs.c2
-rw-r--r--gtk/packet_win.c2
9 files changed, 9 insertions, 9 deletions
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"