From 25f5d2794078388662eef476e8a139e102d786cd Mon Sep 17 00:00:00 2001
From: vlm <vlm@59561ff5-6e30-0410-9f3c-9617f08c8826>
Date: Tue, 15 Feb 2005 03:37:42 +0000
Subject: [PATCH] member -> Member

git-svn-id: https://asn1c.svn.sourceforge.net/svnroot/asn1c/trunk@647 59561ff5-6e30-0410-9f3c-9617f08c8826
---
 libasn1compiler/asn1c_C.c          |  2 +-
 libasn1compiler/asn1c_constraint.c | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/libasn1compiler/asn1c_C.c b/libasn1compiler/asn1c_C.c
index dae8659a..883644b4 100644
--- a/libasn1compiler/asn1c_C.c
+++ b/libasn1compiler/asn1c_C.c
@@ -1431,7 +1431,7 @@ emit_member_table(arg_t *arg, asn1p_expr_t *expr) {
 	}
 	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 63915359..b586d4db 100644
--- a/libasn1compiler/asn1c_constraint.c
+++ b/libasn1compiler/asn1c_constraint.c
@@ -76,9 +76,10 @@ asn1c_emit_constraint_checking_code(arg_t *arg) {
 			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 @@ static int
 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 @@ emit_alphabet_check_loop(arg_t *arg, asn1cnst_range_t *range) {
 	} 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: