summaryrefslogtreecommitdiff
path: root/globals.h
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 /globals.h
parent4e8bb316935a17a5eb3a6217aa14e3b4c062a2e1 (diff)
downloadwireshark-fb84384942a20a50879fae3c3557625167ad5b0b.tar.gz
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 'globals.h')
-rw-r--r--globals.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/globals.h b/globals.h
index 748bea4317..cecc552a3d 100644
--- a/globals.h
+++ b/globals.h
@@ -1,7 +1,7 @@
/* globals.h
* Global defines, etc.
*
- * $Id: globals.h,v 1.22 2000/09/28 03:16:05 gram Exp $
+ * $Id: globals.h,v 1.23 2000/10/19 22:59:23 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -38,7 +38,6 @@ extern gchar comp_info_str[256];
extern gchar *ethereal_path;
extern gchar *last_open_dir;
extern gboolean auto_scroll_live;
-extern int g_resolving_actif;
extern field_info *finfo_selected;
extern ts_type timestamp_type;