aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-x411.c
diff options
context:
space:
mode:
authorwmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7>2009-02-07 14:33:47 +0000
committerwmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7>2009-02-07 14:33:47 +0000
commit2209d8140a65a4957613e2afb657bf5c13da8933 (patch)
tree659931f75321dfd7d2cbb1e009a8a5010a9acc32 /epan/dissectors/packet-x411.c
parent31bd65544f4b94a136c6021f8a06444c55351e0c (diff)
#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
Diffstat (limited to 'epan/dissectors/packet-x411.c')
-rw-r--r--epan/dissectors/packet-x411.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/epan/dissectors/packet-x411.c b/epan/dissectors/packet-x411.c
index ad9c0cdfc7..4c2a2bbf65 100644
--- a/epan/dissectors/packet-x411.c
+++ b/epan/dissectors/packet-x411.c
@@ -38,7 +38,6 @@
#include <glib.h>
#include <epan/packet.h>
#include <epan/prefs.h>
-#include <epan/conversation.h>
#include <epan/oids.h>
#include <epan/asn1.h>
#include <epan/expert.h>
@@ -608,7 +607,7 @@ static int hf_x411_G3FacsimileNonBasicParameters_jpeg = -1;
static int hf_x411_G3FacsimileNonBasicParameters_processable_mode_26 = -1;
/*--- End of included file: packet-x411-hf.c ---*/
-#line 86 "packet-x411-template.c"
+#line 85 "packet-x411-template.c"
/* Initialize the subtree pointers */
static gint ett_x411 = -1;
@@ -786,7 +785,7 @@ static gint ett_x411_SecurityCategories = -1;
static gint ett_x411_SecurityCategory = -1;
/*--- End of included file: packet-x411-ett.c ---*/
-#line 96 "packet-x411-template.c"
+#line 95 "packet-x411-template.c"
/* Dissector tables */
static dissector_table_t x411_extension_dissector_table;
@@ -6975,7 +6974,7 @@ static void dissect_SecurityClassification_PDU(tvbuff_t *tvb _U_, packet_info *p
/*--- End of included file: packet-x411-fn.c ---*/
-#line 104 "packet-x411-template.c"
+#line 103 "packet-x411-template.c"
char* x411_get_last_oraddress() { return oraddress; }
@@ -9163,7 +9162,7 @@ void proto_register_x411(void) {
"", HFILL }},
/*--- End of included file: packet-x411-hfarr.c ---*/
-#line 239 "packet-x411-template.c"
+#line 238 "packet-x411-template.c"
};
/* List of subtrees */
@@ -9343,7 +9342,7 @@ void proto_register_x411(void) {
&ett_x411_SecurityCategory,
/*--- End of included file: packet-x411-ettarr.c ---*/
-#line 251 "packet-x411-template.c"
+#line 250 "packet-x411-template.c"
};
module_t *x411_module;
@@ -9533,7 +9532,7 @@ void proto_reg_handoff_x411(void) {
/*--- End of included file: packet-x411-dis-tab.c ---*/
-#line 283 "packet-x411-template.c"
+#line 282 "packet-x411-template.c"
/* APPLICATION CONTEXT */