diff --git a/src/pike_types.c b/src/pike_types.c index a3efc7c2ab1ae97630af855278c210d38a0aad4f..d406d8ed7b7fc1e8c0061c267451bfce7cbe18cc 100644 --- a/src/pike_types.c +++ b/src/pike_types.c @@ -2,7 +2,7 @@ || This file is part of Pike. For copyright information see COPYRIGHT. || Pike is distributed under GPL, LGPL and MPL. See the file COPYING || for more information. -|| $Id: pike_types.c,v 1.290 2007/04/17 13:07:26 grubba Exp $ +|| $Id: pike_types.c,v 1.291 2007/04/18 11:58:59 grubba Exp $ */ #include "global.h" @@ -2292,8 +2292,6 @@ static int lower_or_pike_types(struct pike_type *t1, #endif if (t1 == t2) { t = t1; - } else if (zero_implied && (t1->type == T_MIXED || t2->type == T_MIXED)) { - t = mixed_type_string; } else if (t1->type < t2->type) { t = t1; ret = -1; @@ -2388,6 +2386,9 @@ static int lower_or_pike_types(struct pike_type *t1, } else { switch(t->type) { case T_FLOAT: + case T_MIXED: + case T_VOID: + case T_ZERO: /* There can only be one. */ break; case T_INT: