osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Remove #include "gtk/colors.h" from file.h, which keep the GTK+ header 

files from being #included in epan/packet.c.
Fix the other files that need either "gtk/colors.h" or <gtk/gtk.h> #included
as a result of not pulling in gtk/colors.h automatically because of file.h.

svn path=/trunk/; revision=2519
This commit is contained in:
Gilbert Ramirez 2000-10-20 04:26:40 +00:00
parent a3b0da9bc8
commit 3424ae654e
9 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
file.c
View File

@ -1,7 +1,7 @@
/* file.c
* File I/O routines
*
* $Id: file.c,v 1.224 2000/10/06 10:10:46 gram Exp $
* $Id: file.c,v 1.225 2000/10/20 04:26:38 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -85,6 +85,7 @@
#include "dfilter.h"
#include "conversation.h"
#include "globals.h"
#include "gtk/colors.h"
#include "plugins.h"

5
file.h
View File

@ -1,7 +1,7 @@
/* file.h
* Definitions for file structures and routines
*
* $Id: file.h,v 1.77 2000/10/06 10:10:48 gram Exp $
* $Id: file.h,v 1.78 2000/10/20 04:26:38 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -37,7 +37,6 @@
#endif
#include "dfilter.h"
#include "gtk/colors.h" /* XXX */
#include "print.h"
#include <errno.h>
@ -90,7 +89,7 @@ typedef struct _capture_file {
wtap *wth; /* Wiretap session */
dfilter *rfcode; /* Compiled read filter program */
gchar *dfilter; /* Display filter string */
colfilter *colors; /* Colors for colorizing packet window */
struct _colfilter *colors; /* Colors for colorizing packet window */
dfilter *dfcode; /* Compiled display filter program */
#ifdef HAVE_LIBPCAP
gchar *cfilter; /* Capture filter string */

3
gtk/column_prefs.c
View File

@ -1,7 +1,7 @@
/* column_prefs.c
* Dialog box for column preferences
*
* $Id: column_prefs.c,v 1.3 2000/08/21 08:09:10 guy Exp $
* $Id: column_prefs.c,v 1.4 2000/10/20 04:26:40 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -28,6 +28,7 @@
#endif
#include <errno.h>
#include <gtk/gtk.h>
#include "globals.h"
#include "column_prefs.h"

3
gtk/gui_prefs.c
View File

@ -1,7 +1,7 @@
/* gui_prefs.c
* Dialog box for GUI preferences
*
* $Id: gui_prefs.c,v 1.21 2000/10/09 06:38:36 guy Exp $
* $Id: gui_prefs.c,v 1.22 2000/10/20 04:26:40 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -28,6 +28,7 @@
#endif
#include <errno.h>
#include <gtk/gtk.h>
#include "globals.h"
#include "gui_prefs.h"

3
gtk/main.c
View File

@ -1,6 +1,6 @@
/* main.c
*
* $Id: main.c,v 1.160 2000/10/16 23:18:05 guy Exp $
* $Id: main.c,v 1.161 2000/10/20 04:26:40 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -118,6 +118,7 @@
#include "packet_win.h"
#include "gtkglobals.h"
#include "plugins.h"
#include "colors.h"
packet_info pi;
capture_file cfile;

3
gtk/plugins_dlg.c
View File

@ -1,7 +1,7 @@
/* plugins_dlg.c
* Dialog boxes for plugins
*
* $Id: plugins_dlg.c,v 1.18 2000/08/23 06:56:06 guy Exp $
* $Id: plugins_dlg.c,v 1.19 2000/10/20 04:26:40 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -35,6 +35,7 @@
#include <stdlib.h>
#include <string.h>
#include <gtk/gtk.h>
#include "globals.h"
#include "plugins.h"

3
gtk/print_prefs.c
View File

@ -1,7 +1,7 @@
/* print_prefs.c
* Dialog boxes for preferences for printing
*
* $Id: print_prefs.c,v 1.7 2000/08/21 08:09:15 guy Exp $
* $Id: print_prefs.c,v 1.8 2000/10/20 04:26:40 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -28,6 +28,7 @@
#endif
#include <errno.h>
#include <gtk/gtk.h>
#include "globals.h"
#include "print_prefs.h"

3
gtk/proto_draw.c
View File

@ -1,7 +1,7 @@
/* proto_draw.c
* Routines for GTK+ packet display
*
* $Id: proto_draw.c,v 1.21 2000/09/09 10:26:56 guy Exp $
* $Id: proto_draw.c,v 1.22 2000/10/20 04:26:40 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -45,6 +45,7 @@
#include "packet.h"
#include "util.h"
#include "colors.h"
#include "prefs.h"
#include "proto_draw.h"
#include "packet_win.h"

3
gtk/stream_prefs.c
View File

@ -1,7 +1,7 @@
/* stream_prefs.c
* Dialog boxes for preferences for the stream window
*
* $Id: stream_prefs.c,v 1.5 2000/09/09 10:04:53 guy Exp $
* $Id: stream_prefs.c,v 1.6 2000/10/20 04:26:40 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -28,6 +28,7 @@
#endif
#include <errno.h>
#include <gtk/gtk.h>
#include "globals.h"
#include "stream_prefs.h"