Dissectors should not use dfilter.h, don't include it.

XXX ncp2222 dissector is using dfilter_compile(), why?

svn path=/trunk/; revision=53766

6 files changed, 9 insertions, 1 deletions

diff --git a/epan/dissectors/packet-ansi_a.h b/epan/dissectors/packet-ansi_a.h
index edb4d97db6..dde8c4004e 100644
--- a/epan/dissectors/packet-ansi_a.h
+++ b/epan/dissectors/packet-ansi_a.h
@@ -24,6 +24,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include <epan/proto.h>
+
 typedef struct _ansi_a_tap_rec_t {
     /*
      * value from packet-bssap.h
diff --git a/epan/dissectors/packet-gsm_a_common.h b/epan/dissectors/packet-gsm_a_common.h
index 137105c72a..b1b42f835e 100644
--- a/epan/dissectors/packet-gsm_a_common.h
+++ b/epan/dissectors/packet-gsm_a_common.h
@@ -51,6 +51,8 @@
 #ifndef __PACKET_GSM_A_COMMON_H__
 #define __PACKET_GSM_A_COMMON_H__
 
+#include <epan/proto.h>
+
 #include "packet-sccp.h"
 #include "ws_symbol_export.h"
 
diff --git a/epan/dissectors/packet-ncp-int.h b/epan/dissectors/packet-ncp-int.h
index b7daacb15a..2bdc09815d 100644
--- a/epan/dissectors/packet-ncp-int.h
+++ b/epan/dissectors/packet-ncp-int.h
@@ -78,7 +78,7 @@ struct _sub_ptvc_record {
 
 typedef struct {
 	const char		*dfilter_text;
-	dfilter_t		*dfilter;
+	struct epan_dfilter	*dfilter;
 } conditional_record;
 
 typedef struct {
diff --git a/epan/dissectors/packet-radius.h b/epan/dissectors/packet-radius.h
index c85ace294c..e6a5c7cf9f 100644
--- a/epan/dissectors/packet-radius.h
+++ b/epan/dissectors/packet-radius.h
@@ -23,6 +23,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include <epan/proto.h>
+
 /* radius packet-type codes */
 /* 09/12/2011: Updated from IANA:
  * http://www.iana.org/assignments/radius-types/radius-types.xml#radius-types-27
diff --git a/epan/dissectors/packet-smb.h b/epan/dissectors/packet-smb.h
index 73bcfe02a1..45f9b3fe80 100644
--- a/epan/dissectors/packet-smb.h
+++ b/epan/dissectors/packet-smb.h
@@ -28,6 +28,7 @@
 
 #include "ws_symbol_export.h"
 
+#include <epan/proto.h>
 #include <epan/wmem/wmem.h>
 
 WS_DLL_PUBLIC gboolean sid_name_snooping;
diff --git a/epan/dissectors/packet-wsp.h b/epan/dissectors/packet-wsp.h
index afafed666f..caf238c12d 100644
--- a/epan/dissectors/packet-wsp.h
+++ b/epan/dissectors/packet-wsp.h
@@ -30,6 +30,7 @@
 #ifndef __PACKET_WSP_H__
 #define __PACKET_WSP_H__
 
+#include <epan/proto.h>
 #include "ws_symbol_export.h"
 
 /* These reason codes are used in the WTP dissector as the WTP user is