Some minor mods in mixed mode checking

This commit is contained in:
ceriel 1991-03-27 12:46:37 +00:00
parent 52287793fb
commit 8a25f4e66b
2 changed files with 3 additions and 3 deletions

View file

@ -515,9 +515,9 @@ legal_mixture(tp, otp, diag)
struct type *tp, *otp; struct type *tp, *otp;
int diag; 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; int retval = 1;
struct proto *prot; register struct proto *prot;
int fund; int fund;
ASSERT( (pl != 0) ^ (opl != 0)); ASSERT( (pl != 0) ^ (opl != 0));

View file

@ -409,7 +409,7 @@ global_redecl(idf, new_sc, tp)
register struct def *def = idf->id_def; register struct def *def = idf->id_def;
while (def->df_level != L_GLOBAL) def = def->next; 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); error("redeclaration of %s with different type", idf->id_text);
return; return;
} else update_proto(tp, def->df_type); } else update_proto(tp, def->df_type);