diff options
author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-12-03 22:16:49 +0000 |
---|---|---|
committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-12-03 22:16:49 +0000 |
commit | 65db82872c943d87e5191c65c369d41b9a4d533e (patch) | |
tree | 0ca97a1e6ede7c1710e66f7d5c352b2d4fef0656 /epan/dissectors/packet-camel.c | |
parent | dbd9c134fafed03d108d6a572cf5b4ccef108b7b (diff) |
When including <epan/prefs.h> don't force inclusion of <epan/uat.h>
svn path=/trunk/; revision=53769
Diffstat (limited to 'epan/dissectors/packet-camel.c')
-rw-r--r-- | epan/dissectors/packet-camel.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c index 4440275b03..bca870f7fb 100644 --- a/epan/dissectors/packet-camel.c +++ b/epan/dissectors/packet-camel.c @@ -51,6 +51,7 @@ #include <epan/asn1.h> #include <epan/expert.h> +#include <stdlib.h> #include <string.h> #include "packet-ber.h" @@ -602,7 +603,7 @@ static int hf_camel_present = -1; /* INTEGER */ static int hf_camel_InvokeId_present = -1; /* InvokeId_present */ /*--- End of included file: packet-camel-hf.c ---*/ -#line 109 "../../asn1/camel/packet-camel-template.c" +#line 110 "../../asn1/camel/packet-camel-template.c" static struct camelsrt_info_t * gp_camelsrt_info; @@ -829,7 +830,7 @@ static gint ett_camel_T_problem = -1; static gint ett_camel_InvokeId = -1; /*--- End of included file: packet-camel-ett.c ---*/ -#line 137 "../../asn1/camel/packet-camel-template.c" +#line 138 "../../asn1/camel/packet-camel-template.c" static expert_field ei_camel_unknown_invokeData = EI_INIT; static expert_field ei_camel_unknown_returnResultData = EI_INIT; @@ -1157,7 +1158,7 @@ static const value_string camel_ectTreatmentIndicator_values[] = { #define noInvokeId NULL /*--- End of included file: packet-camel-val.h ---*/ -#line 280 "../../asn1/camel/packet-camel-template.c" +#line 281 "../../asn1/camel/packet-camel-template.c" /*--- Included file: packet-camel-table.c ---*/ @@ -1247,7 +1248,7 @@ static const value_string camel_err_code_string_vals[] = { /*--- End of included file: packet-camel-table.c ---*/ -#line 282 "../../asn1/camel/packet-camel-template.c" +#line 283 "../../asn1/camel/packet-camel-template.c" static char camel_number_to_char(int number) { @@ -7010,7 +7011,7 @@ static void dissect_CAP_U_ABORT_REASON_PDU(tvbuff_t *tvb _U_, packet_info *pinfo /*--- End of included file: packet-camel-fn.c ---*/ -#line 329 "../../asn1/camel/packet-camel-template.c" +#line 330 "../../asn1/camel/packet-camel-template.c" /*--- Included file: packet-camel-table2.c ---*/ @@ -7217,7 +7218,7 @@ static int dissect_returnErrorData(proto_tree *tree, tvbuff_t *tvb, int offset,a /*--- End of included file: packet-camel-table2.c ---*/ -#line 331 "../../asn1/camel/packet-camel-template.c" +#line 332 "../../asn1/camel/packet-camel-template.c" static guint8 camel_pdu_type = 0; @@ -7416,7 +7417,7 @@ void proto_reg_handoff_camel(void) { /*--- End of included file: packet-camel-dis-tab.c ---*/ -#line 522 "../../asn1/camel/packet-camel-template.c" +#line 523 "../../asn1/camel/packet-camel-template.c" } else { range_foreach(ssn_range, range_delete_callback); g_free(ssn_range); @@ -9530,7 +9531,7 @@ void proto_register_camel(void) { "InvokeId_present", HFILL }}, /*--- End of included file: packet-camel-hfarr.c ---*/ -#line 695 "../../asn1/camel/packet-camel-template.c" +#line 696 "../../asn1/camel/packet-camel-template.c" }; /* List of subtrees */ @@ -9745,7 +9746,7 @@ void proto_register_camel(void) { &ett_camel_InvokeId, /*--- End of included file: packet-camel-ettarr.c ---*/ -#line 711 "../../asn1/camel/packet-camel-template.c" +#line 712 "../../asn1/camel/packet-camel-template.c" }; static ei_register_info ei[] = { |