From 2507ce4cb34fec817526cf74adba551027991f40 Mon Sep 17 00:00:00 2001 From: Alexis La Goutte Date: Mon, 17 Mar 2014 10:39:42 +0100 Subject: [PATCH] Revert de6bfa12b0c002e1930cfb9946078097d294acf8 (break Linux and Mac OS X buildbot...) Change-Id: If5a6a77909b2d178052605cf2fc6fc0ef758553c Reviewed-on: https://code.wireshark.org/review/706 Reviewed-by: Alexis La Goutte Tested-by: Alexis La Goutte --- asn1/atn-ulcs/packet-atn-ulcs-template.c | 1 + epan/dissectors/packet-atn-ulcs.c | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/asn1/atn-ulcs/packet-atn-ulcs-template.c b/asn1/atn-ulcs/packet-atn-ulcs-template.c index a4b2d1c2a0..455a1513d7 100644 --- a/asn1/atn-ulcs/packet-atn-ulcs-template.c +++ b/asn1/atn-ulcs/packet-atn-ulcs-template.c @@ -123,6 +123,7 @@ which ATN standard is supported ? #include #include +#include #include "packet-atn-ulcs.h" diff --git a/epan/dissectors/packet-atn-ulcs.c b/epan/dissectors/packet-atn-ulcs.c index b89a12b8b6..bd193bfed1 100644 --- a/epan/dissectors/packet-atn-ulcs.c +++ b/epan/dissectors/packet-atn-ulcs.c @@ -131,6 +131,7 @@ which ATN standard is supported ? #include #include +#include #include "packet-atn-ulcs.h" @@ -276,7 +277,7 @@ static int hf_atn_ulcs_ACSE_requirements_authentication = -1; static int hf_atn_ulcs_ACSE_requirements_application_context_negotiation = -1; /*--- End of included file: packet-atn-ulcs-hf.c ---*/ -#line 194 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c" +#line 195 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c" /*--- Included file: packet-atn-ulcs-ett.c ---*/ @@ -308,7 +309,7 @@ static gint ett_atn_ulcs_RelativeDistinguishedName = -1; static gint ett_atn_ulcs_AttributeTypeAndValue = -1; /*--- End of included file: packet-atn-ulcs-ett.c ---*/ -#line 196 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c" +#line 197 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c" static gint ett_atn_ulcs = -1; static gint ett_atn_acse = -1; @@ -1592,7 +1593,7 @@ static void dissect_ACSE_apdu_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro /*--- End of included file: packet-atn-ulcs-fn.c ---*/ -#line 200 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c" +#line 201 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c" #if 0 /* re-implementing external data: packet-per.c */ @@ -2497,7 +2498,7 @@ void proto_register_atn_ulcs (void) NULL, HFILL }}, /*--- End of included file: packet-atn-ulcs-hfarr.c ---*/ -#line 812 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c" +#line 813 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c" {&hf_atn_ses_type, { "SPDU Type", "atn-ulcs.ses.type", @@ -2577,7 +2578,7 @@ void proto_register_atn_ulcs (void) &ett_atn_ulcs_AttributeTypeAndValue, /*--- End of included file: packet-atn-ulcs-ettarr.c ---*/ -#line 862 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c" +#line 863 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c" &ett_atn_ses, &ett_atn_pres, &ett_atn_acse, -- 2.34.1