c-typeck.c (build_conditional_expr): Handle complex data types.

2000-06-06  Gabriel Dos Reis  <gdr@codesourcery.com>

        * c-typeck.c (build_conditional_expr): Handle complex data types.

From-SVN: r34422

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bb74239d12abab5815a148f8f0991d571d224c58..10564342a66e225609d452d3cd0df94351de4178 100644 (file)
--- 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 f58845692ac93447c568cabdefc9a4e26d4f26d1..c4065b4c89e89b0ff04bc4830b4b42a7f4c0e648 100644 (file)
--- 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);