osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Guy Harris 2000-10-19 22:59:24 +00:00
parent 4e8bb31693
commit fb84384942
7 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
epan/resolv.c
View File

@ -1,7 +1,7 @@
/* resolv.c
* Routines for network object lookup
*
* $Id: resolv.c,v 1.2 2000/10/16 23:17:40 guy Exp $
* $Id: resolv.c,v 1.3 2000/10/19 22:59:24 guy Exp $
*
* Laurent Deniel <deniel@worldnet.fr>
*
@ -80,7 +80,6 @@
#include "packet.h"
#include "packet-ipv6.h"
#include "packet-ipx.h"
#include "globals.h"
#include "resolv.h"
#include "util.h"

3
epan/resolv.h
View File

@ -1,7 +1,7 @@
/* resolv.h
* Definitions for network object lookup
*
* $Id: resolv.h,v 1.2 2000/10/16 23:17:40 guy Exp $
* $Id: resolv.h,v 1.3 2000/10/19 22:59:24 guy Exp $
*
* Laurent Deniel <deniel@worldnet.fr>
*
@ -34,6 +34,7 @@
/* global variables */
extern int g_resolving_actif;
extern gchar *g_ethers_path;
extern gchar *g_ipxnets_path;
extern gchar *g_manuf_path;

3
globals.h
View File

@ -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;

3
gtk/capture_dlg.c
View File

@ -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"

3
gtk/display_opts.c
View File

@ -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"

3
gtk/file_dlg.c
View File

@ -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"

3
gtk/menu.c
View File

@ -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"