diff options
| author | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-10-20 04:26:40 +0000 |
|---|---|---|
| committer | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-10-20 04:26:40 +0000 |
| commit | 3424ae654e8c6f4c690c92624bb124bad2ea5509 (patch) | |
| tree | 3f8e1be2f10ae270959de8d11e71bacf82797acf /file.h | |
| parent | a3b0da9bc8ab2f8e5214607cce5dcbc3c399f492 (diff) | |
| download | wireshark-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 'file.h')
| -rw-r--r-- | file.h | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -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 */ |