aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--file.c3
-rw-r--r--file.h5
-rw-r--r--gtk/column_prefs.c3
-rw-r--r--gtk/gui_prefs.c3
-rw-r--r--gtk/main.c3
-rw-r--r--gtk/plugins_dlg.c3
-rw-r--r--gtk/print_prefs.c3
-rw-r--r--gtk/proto_draw.c3
-rw-r--r--gtk/stream_prefs.c3
9 files changed, 18 insertions, 11 deletions
diff --git a/file.c b/file.c
index b73db738eb..bd2042f80b 100644
--- a/file.c
+++ b/file.c
@@ -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"
diff --git a/file.h b/file.h
index 0aa56c2387..21e6af2689 100644
--- a/file.h
+++ b/file.h
@@ -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 */
diff --git a/gtk/column_prefs.c b/gtk/column_prefs.c
index cd9f9d1e21..dc32b19089 100644
--- a/gtk/column_prefs.c
+++ b/gtk/column_prefs.c
@@ -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"
diff --git a/gtk/gui_prefs.c b/gtk/gui_prefs.c
index a8db02a28a..bf6747d781 100644
--- a/gtk/gui_prefs.c
+++ b/gtk/gui_prefs.c
@@ -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"
diff --git a/gtk/main.c b/gtk/main.c
index 98b8596ae7..bc1478a630 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -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;
diff --git a/gtk/plugins_dlg.c b/gtk/plugins_dlg.c
index 5239141a30..3c0672900d 100644
--- a/gtk/plugins_dlg.c
+++ b/gtk/plugins_dlg.c
@@ -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"
diff --git a/gtk/print_prefs.c b/gtk/print_prefs.c
index 8ae97d972d..8f9a029a46 100644
--- a/gtk/print_prefs.c
+++ b/gtk/print_prefs.c
@@ -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"
diff --git a/gtk/proto_draw.c b/gtk/proto_draw.c
index 7e5011a4b6..65c5e2a150 100644
--- a/gtk/proto_draw.c
+++ b/gtk/proto_draw.c
@@ -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"
diff --git a/gtk/stream_prefs.c b/gtk/stream_prefs.c
index c5e0f9449e..544bcded72 100644
--- a/gtk/stream_prefs.c
+++ b/gtk/stream_prefs.c
@@ -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"