#include <epan/conversation.h> and/or #include <epan/emem.h> not req'd ...

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27390 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 8 insertions, 9 deletions

diff --git a/epan/dissectors/packet-cmip.c b/epan/dissectors/packet-cmip.c
index fd875a4364..4da5a9c2a6 100644
--- a/epan/dissectors/packet-cmip.c
+++ b/epan/dissectors/packet-cmip.c
@@ -37,7 +37,6 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-#include <epan/conversation.h>
 #include <epan/oids.h>
 #include <epan/asn1.h>
 
@@ -348,7 +347,7 @@ static int hf_cmip_T_daysOfWeek_friday = -1;
 static int hf_cmip_T_daysOfWeek_saturday = -1;
 
 /*--- End of included file: packet-cmip-hf.c ---*/
-#line 63 "packet-cmip-template.c"
+#line 62 "packet-cmip-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_cmip = -1;
@@ -478,7 +477,7 @@ static gint ett_cmip_T_modificationList = -1;
 static gint ett_cmip_T_modificationList_item = -1;
 
 /*--- End of included file: packet-cmip-ett.c ---*/
-#line 67 "packet-cmip-template.c"
+#line 66 "packet-cmip-template.c"
 
 static guint32 opcode;
 
@@ -534,7 +533,7 @@ static const value_string cmip_error_code_vals[] = {
 
 
 /*--- End of included file: packet-cmip-table.c ---*/
-#line 71 "packet-cmip-template.c"
+#line 70 "packet-cmip-template.c"
 
 static int opcode_type;
 #define OPCODE_INVOKE        1
@@ -645,7 +644,7 @@ static const char *objectclass_identifier_id;
 #define noInvokeId                     NULL
 
 /*--- End of included file: packet-cmip-val.h ---*/
-#line 93 "packet-cmip-template.c"
+#line 92 "packet-cmip-template.c"
 
 /*--- Included file: packet-cmip-fn.c ---*/
 #line 1 "packet-cmip-fn.c"
@@ -4386,7 +4385,7 @@ static void dissect_WeekMask_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot
 
 
 /*--- End of included file: packet-cmip-fn.c ---*/
-#line 94 "packet-cmip-template.c"
+#line 93 "packet-cmip-template.c"
 
 
 
@@ -5591,7 +5590,7 @@ void proto_register_cmip(void) {
         "", HFILL }},
 
 /*--- End of included file: packet-cmip-hfarr.c ---*/
-#line 194 "packet-cmip-template.c"
+#line 193 "packet-cmip-template.c"
   };
 
   /* List of subtrees */
@@ -5723,7 +5722,7 @@ void proto_register_cmip(void) {
     &ett_cmip_T_modificationList_item,
 
 /*--- End of included file: packet-cmip-ettarr.c ---*/
-#line 200 "packet-cmip-template.c"
+#line 199 "packet-cmip-template.c"
   };
 
   /* Register protocol */
@@ -5808,7 +5807,7 @@ void proto_register_cmip(void) {
 
 
 /*--- End of included file: packet-cmip-dis-tab.c ---*/
-#line 209 "packet-cmip-template.c"
+#line 208 "packet-cmip-template.c"
     oid_add_from_string("discriminatorId(1)","2.9.3.2.7.1");
 
 }