There's no need for a member of a "capture_file" structure holding a

compiled capture filter program, so remove it, and remove the include of
<pcap.h> from "file.h"; instead, have local "struct bpf_program"
structures where needed, and have those files that need stuff from
<pcap.h> include it.

This cleans stuff up a bit, and should eliminate a pile of compile
warnings with Visual C++ due to <pcap.h> and some GTK+/GLib header file
(or files they include) both defining "inline".

svn path=/trunk/; revision=2954

1 files changed, 1 insertions, 8 deletions

diff --git a/file.h b/file.h
index 21e6af2689..196a18debb 100644
--- a/file.h
+++ b/file.h
@@ -1,7 +1,7 @@
 /* file.h
  * Definitions for file structures and routines
  *
- * $Id: file.h,v 1.78 2000/10/20 04:26:38 gram Exp $
+ * $Id: file.h,v 1.79 2001/01/28 23:56:27 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -32,10 +32,6 @@
 
 #include "wiretap/wtap.h"
 
-#ifdef HAVE_LIBPCAP
-#include <pcap.h>
-#endif
-
 #include "dfilter.h"
 #include "print.h"
 
@@ -56,8 +52,6 @@
 #define file_close fclose
 #endif /* HAVE_LIBZ */
 
-typedef struct bpf_program bpf_prog;
-
 /* Current state of file. */
 typedef enum {
 	FILE_CLOSED,		/* No file open */
@@ -93,7 +87,6 @@ typedef struct _capture_file {
   dfilter     *dfcode;    /* Compiled display filter program */ 
 #ifdef HAVE_LIBPCAP
   gchar       *cfilter;   /* Capture filter string */
-  bpf_prog     fcode;     /* Compiled capture filter program */
 #endif
   gchar       *sfilter;   /* Search filter string */
   gboolean     sbackward;  /* TRUE if search is backward, FALSE if forward */