member -> Member
git-svn-id: https://asn1c.svn.sourceforge.net/svnroot/asn1c/trunk@647 59561ff5-6e30-0410-9f3c-9617f08c8826
diff --git a/libasn1compiler/asn1c_C.c b/libasn1compiler/asn1c_C.c
index dae8659..883644b 100644
--- a/libasn1compiler/asn1c_C.c
+++ b/libasn1compiler/asn1c_C.c
@@ -1431,7 +1431,7 @@
}
if(C99_MODE) OUT(".type = ");
if(expr->_anonymous_type && (expr->expr_type & ASN_CONSTR_MASK)) {
- OUT("(void *)&asn_DEF_%s_member,\n",
+ OUT("(void *)&asn_DEF_%s_Member,\n",
MKID_nr(arg->expr->Identifier));
} else if(expr->expr_type & ASN_CONSTR_MASK) {
OUT("(void *)&asn_DEF_%s,\n",
diff --git a/libasn1compiler/asn1c_constraint.c b/libasn1compiler/asn1c_constraint.c
index 6391535..b586d4d 100644
--- a/libasn1compiler/asn1c_constraint.c
+++ b/libasn1compiler/asn1c_constraint.c
@@ -76,9 +76,10 @@
produce_st = 1;
break;
}
- if(produce_st)
- OUT("const %s_t *st = sptr;\n",
- asn1c_type_name(arg, arg->expr, TNF_SAFE));
+ if(produce_st) {
+ char *tname = asn1c_type_name(arg, arg->expr, TNF_SAFE);
+ OUT("const %s_t *st = (const %s_t *)sptr;\n", tname, tname);
+ }
if(r_size || r_value) {
if(r_size) {
@@ -360,6 +361,7 @@
emit_alphabet_check_loop(arg_t *arg, asn1cnst_range_t *range) {
asn1c_integer_t natural_stop;
asn1p_expr_t *terminal;
+ char *tname;
terminal = asn1f_find_terminal_type_ex(arg->asn, arg->expr);
if(terminal) {
@@ -368,8 +370,8 @@
} else {
terminal = arg->expr;
}
- OUT("const %s_t *st = sptr;\n",
- asn1c_type_name(arg, terminal, TNF_SAFE));
+ tname = asn1c_type_name(arg, terminal, TNF_SAFE);
+ OUT("const %s_t *st = (const %s_t *)sptr;\n", tname, tname);
switch(terminal->expr_type) {
case ASN_STRING_UTF8String: