diff options
author | Bill Meier <wmeier@newsguy.com> | 2013-03-21 14:29:58 +0000 |
---|---|---|
committer | Bill Meier <wmeier@newsguy.com> | 2013-03-21 14:29:58 +0000 |
commit | 1f083fd6545ceaf6a6f7cf8d8dfe105ae775b6cf (patch) | |
tree | 67439bd39ba819ac3fef33e52c83ce414c36880d /asn1 | |
parent | 48af69f95fe3b2ac35145570da940ae9e4f4b677 (diff) |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 attachments #10423,#10424
svn path=/trunk/; revision=48450
Diffstat (limited to 'asn1')
-rw-r--r-- | asn1/ldap/packet-ldap-template.c | 2 | ||||
-rw-r--r-- | asn1/m3ap/m3ap.cnf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/asn1/ldap/packet-ldap-template.c b/asn1/ldap/packet-ldap-template.c index 70a28971fe..e828a22533 100644 --- a/asn1/ldap/packet-ldap-template.c +++ b/asn1/ldap/packet-ldap-template.c @@ -2280,7 +2280,7 @@ void proto_register_ldap(void) { sizeof(attribute_type_t), "custom_ldap_attribute_types", TRUE, - (void*) &attribute_types, + (void**) &attribute_types, &num_attribute_types, /* specifies named fields, so affects dissection and the set of named fields */ diff --git a/asn1/m3ap/m3ap.cnf b/asn1/m3ap/m3ap.cnf index a4061b9951..ca75f5b83e 100644 --- a/asn1/m3ap/m3ap.cnf +++ b/asn1/m3ap/m3ap.cnf @@ -91,7 +91,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound") static const asn1_par_def_t ProtocolIE_ContainerList_pars[] = { { "lowerBound", ASN1_PAR_INTEGER }, { "upperBound", ASN1_PAR_INTEGER }, - { NULL, 0 } + { NULL, (asn1_par_type)0 } }; asn1_stack_frame_check(actx, "ProtocolIE-ContainerList", ProtocolIE_ContainerList_pars); #.END |