diff options
| author | Gerald Combs <gerald@wireshark.org> | 2006-06-20 18:30:54 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2006-06-20 18:30:54 +0000 |
| commit | f7e38bd5e65ca78ca1ff385a403b2eb01255c697 (patch) | |
| tree | d60c188ff951ee2301f647bee53310e2c80af4c3 /epan/dissectors/packet-h225.h | |
| parent | 797bb2d5d7cfcaf497585bd68afe1d37d96b9852 (diff) | |
Change ETH_VAR_IMPORT to WS_VAR_IMPORT. Try to fix a duplicate variable
definition in the Catapult DCT2000 code.
svn path=/trunk/; revision=18524
Diffstat (limited to 'epan/dissectors/packet-h225.h')
| -rw-r--r-- | epan/dissectors/packet-h225.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/epan/dissectors/packet-h225.h b/epan/dissectors/packet-h225.h index 579f673b1f..5e1b3c2172 100644 --- a/epan/dissectors/packet-h225.h +++ b/epan/dissectors/packet-h225.h @@ -89,24 +89,24 @@ typedef struct _h225_packet_info { /*--- Included file: packet-h225-exp.h ---*/ #line 1 "packet-h225-exp.h" -ETH_VAR_IMPORT const value_string T_h323_message_body_vals[]; -ETH_VAR_IMPORT const value_string ReleaseCompleteReason_vals[]; +WS_VAR_IMPORT const value_string T_h323_message_body_vals[]; +WS_VAR_IMPORT const value_string ReleaseCompleteReason_vals[]; extern const value_string h225_PresentationIndicator_vals[]; extern const value_string h225_ScreeningIndicator_vals[]; -ETH_VAR_IMPORT const value_string FacilityReason_vals[]; +WS_VAR_IMPORT const value_string FacilityReason_vals[]; extern const value_string AliasAddress_vals[]; extern const value_string h225_PartyNumber_vals[]; -ETH_VAR_IMPORT const value_string RasMessage_vals[]; -ETH_VAR_IMPORT const value_string GatekeeperRejectReason_vals[]; -ETH_VAR_IMPORT const value_string RegistrationRejectReason_vals[]; -ETH_VAR_IMPORT const value_string UnregRequestReason_vals[]; -ETH_VAR_IMPORT const value_string UnregRejectReason_vals[]; -ETH_VAR_IMPORT const value_string AdmissionRejectReason_vals[]; -ETH_VAR_IMPORT const value_string BandRejectReason_vals[]; -ETH_VAR_IMPORT const value_string LocationRejectReason_vals[]; -ETH_VAR_IMPORT const value_string DisengageReason_vals[]; -ETH_VAR_IMPORT const value_string DisengageRejectReason_vals[]; -ETH_VAR_IMPORT const value_string InfoRequestNakReason_vals[]; +WS_VAR_IMPORT const value_string RasMessage_vals[]; +WS_VAR_IMPORT const value_string GatekeeperRejectReason_vals[]; +WS_VAR_IMPORT const value_string RegistrationRejectReason_vals[]; +WS_VAR_IMPORT const value_string UnregRequestReason_vals[]; +WS_VAR_IMPORT const value_string UnregRejectReason_vals[]; +WS_VAR_IMPORT const value_string AdmissionRejectReason_vals[]; +WS_VAR_IMPORT const value_string BandRejectReason_vals[]; +WS_VAR_IMPORT const value_string LocationRejectReason_vals[]; +WS_VAR_IMPORT const value_string DisengageReason_vals[]; +WS_VAR_IMPORT const value_string DisengageRejectReason_vals[]; +WS_VAR_IMPORT const value_string InfoRequestNakReason_vals[]; int dissect_h225_PresentationIndicator(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree, int hf_index); int dissect_h225_ScreeningIndicator(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree, int hf_index); int dissect_h225_NonStandardParameter(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree, int hf_index); |