From: ceriel <none@none>
Date: Wed, 27 Mar 1991 12:46:37 +0000 (+0000)
Subject: Some minor mods in mixed mode checking
X-Git-Tag: release-5-5~1149
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=8a25f4e66beccb2060ae8a5ca3437754749601da;p=ack.git

Some minor mods in mixed mode checking
---

diff --git a/lang/cem/cemcom.ansi/ch3.c b/lang/cem/cemcom.ansi/ch3.c
index 537c7eaf6..8f717031b 100644
--- a/lang/cem/cemcom.ansi/ch3.c
+++ b/lang/cem/cemcom.ansi/ch3.c
@@ -515,9 +515,9 @@ legal_mixture(tp, otp, diag)
 	struct type *tp, *otp;
 	int diag;
 {
-	register struct proto *pl = tp->tp_proto, *opl = otp->tp_proto;
+	struct proto *pl = tp->tp_proto, *opl = otp->tp_proto;
 	int retval = 1;
-	struct proto *prot;
+	register struct proto *prot;
 	int fund;
 
 	ASSERT( (pl != 0) ^ (opl != 0));
diff --git a/lang/cem/cemcom.ansi/idf.c b/lang/cem/cemcom.ansi/idf.c
index cf85bf7f5..00cebe159 100644
--- a/lang/cem/cemcom.ansi/idf.c
+++ b/lang/cem/cemcom.ansi/idf.c
@@ -409,7 +409,7 @@ global_redecl(idf, new_sc, tp)
 	register struct def *def = idf->id_def;
 
 	while (def->df_level != L_GLOBAL) def = def->next;
-	if (!equal_type(tp, def->df_type, 0, 0)) {
+	if (!equal_type(tp, def->df_type, 0, 1)) {
 		error("redeclaration of %s with different type", idf->id_text);
 		return;
 	} else	update_proto(tp, def->df_type);