aboutsummaryrefslogtreecommitdiffstats
path: root/gtk
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2000-10-19 22:59:24 +0000
committerGuy Harris <guy@alum.mit.edu>2000-10-19 22:59:24 +0000
commitfb84384942a20a50879fae3c3557625167ad5b0b (patch)
tree84a59591d245273029905de0524275a017762071 /gtk
parent4e8bb316935a17a5eb3a6217aa14e3b4c062a2e1 (diff)
Move the declaration of "g_resolving_actif" from the top-level
"globals.h" file to "epan/resolv.h", as it's exported by "epan/resolv.c", have files that use "g_resolving_actif" include "resolv.h", and don't have "epan/resolv.c" include "globals.h" so that it doesn't drag in, for example, headers that, in turn, drag in GTK+ headers. svn path=/trunk/; revision=2517
Diffstat (limited to 'gtk')
-rw-r--r--gtk/capture_dlg.c3
-rw-r--r--gtk/display_opts.c3
-rw-r--r--gtk/file_dlg.c3
-rw-r--r--gtk/menu.c3
4 files changed, 8 insertions, 4 deletions
diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c
index 5afdf6b275..dc5d558243 100644
--- a/gtk/capture_dlg.c
+++ b/gtk/capture_dlg.c
@@ -1,7 +1,7 @@
/* capture_dlg.c
* Routines for packet capture windows
*
- * $Id: capture_dlg.c,v 1.34 2000/10/11 06:01:16 guy Exp $
+ * $Id: capture_dlg.c,v 1.35 2000/10/19 22:59:24 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -47,6 +47,7 @@
#include "capture.h"
#include "globals.h"
+#include "resolv.h"
#include "main.h"
#include "ui_util.h"
#include "capture_dlg.h"
diff --git a/gtk/display_opts.c b/gtk/display_opts.c
index 9abdd5856a..b20a70fe7c 100644
--- a/gtk/display_opts.c
+++ b/gtk/display_opts.c
@@ -1,7 +1,7 @@
/* display_opts.c
* Routines for packet display windows
*
- * $Id: display_opts.c,v 1.16 2000/08/23 06:55:32 guy Exp $
+ * $Id: display_opts.c,v 1.17 2000/10/19 22:59:24 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -53,6 +53,7 @@
#endif
#include "globals.h"
+#include "resolv.h"
#include "timestamp.h"
#include "packet.h"
#include "file.h"
diff --git a/gtk/file_dlg.c b/gtk/file_dlg.c
index 8cd7fcebd4..a0f86d08b0 100644
--- a/gtk/file_dlg.c
+++ b/gtk/file_dlg.c
@@ -1,7 +1,7 @@
/* file_dlg.c
* Dialog boxes for handling files
*
- * $Id: file_dlg.c,v 1.31 2000/08/21 15:45:32 deniel Exp $
+ * $Id: file_dlg.c,v 1.32 2000/10/19 22:59:24 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -39,6 +39,7 @@
#include "globals.h"
#include "gtkglobals.h"
+#include "resolv.h"
#include "keys.h"
#include "filter_prefs.h"
#include "ui_util.h"
diff --git a/gtk/menu.c b/gtk/menu.c
index ed990c83fa..ed6d2e03a4 100644
--- a/gtk/menu.c
+++ b/gtk/menu.c
@@ -1,7 +1,7 @@
/* menu.c
* Menu routines
*
- * $Id: menu.c,v 1.45 2000/10/11 06:01:16 guy Exp $
+ * $Id: menu.c,v 1.46 2000/10/19 22:59:24 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -42,6 +42,7 @@
#include "main.h"
#include "menu.h"
#include "packet.h"
+#include "resolv.h"
#include "capture_dlg.h"
#include "color_dlg.h"
#include "file_dlg.h"