From 9e66381cf7fd1703c7094c729d434302a8b9b45f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?=
<grubba@grubba.org>
Date: Wed, 18 Apr 2007 13:58:59 +0200
Subject: [PATCH] More or_pike_types() et al fixes.
Rev: src/pike_types.c:1.291
---
src/pike_types.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/pike_types.c b/src/pike_types.c
index a3efc7c2ab..d406d8ed7b 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:
--
GitLab