aboutsummaryrefslogtreecommitdiffstats
path: root/gtk/main.c
diff options
context:
space:
mode:
authorGilbert Ramirez <gram@alumni.rice.edu>2000-10-20 04:26:40 +0000
committerGilbert Ramirez <gram@alumni.rice.edu>2000-10-20 04:26:40 +0000
commit3424ae654e8c6f4c690c92624bb124bad2ea5509 (patch)
tree3f8e1be2f10ae270959de8d11e71bacf82797acf /gtk/main.c
parenta3b0da9bc8ab2f8e5214607cce5dcbc3c399f492 (diff)
downloadwireshark-3424ae654e8c6f4c690c92624bb124bad2ea5509.tar.gz
wireshark-3424ae654e8c6f4c690c92624bb124bad2ea5509.tar.bz2
wireshark-3424ae654e8c6f4c690c92624bb124bad2ea5509.zip
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
Diffstat (limited to 'gtk/main.c')
-rw-r--r--gtk/main.c3
1 files changed, 2 insertions, 1 deletions
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;