diff options
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/c-typeck.c | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index bb74239..1056434 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2000-06-06 Gabriel Dos Reis <gdr@codesourcery.com> + + * c-typeck.c (build_conditional_expr): Handle complex data types. + 2000-06-05 Jason Merrill <jason@casey.soma.redhat.com> * explow.c (maybe_set_unchanging): New function, broken out from... diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c index f588456..c4065b4 100644 --- a/gcc/c-typeck.c +++ b/gcc/c-typeck.c @@ -3358,8 +3358,10 @@ build_conditional_expr (ifexp, op1, op2) else result_type = TYPE_MAIN_VARIANT (type1); } - else if ((code1 == INTEGER_TYPE || code1 == REAL_TYPE) - && (code2 == INTEGER_TYPE || code2 == REAL_TYPE)) + else if ((code1 == INTEGER_TYPE || code1 == REAL_TYPE + || code1 == COMPLEX_TYPE) + && (code2 == INTEGER_TYPE || code2 == REAL_TYPE + || code2 == COMPLEX_TYPE)) { result_type = common_type (type1, type2); |