From: Gabriel Dos Reis <gdr@codesourcery.com>
Date: Tue, 6 Jun 2000 06:55:35 +0000 (+0000)
Subject: c-typeck.c (build_conditional_expr): Handle complex data types.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f519a4527d3c69dc0f03b10c5c98be6799a913eb;p=gcc.git

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 bb74239d12a..10564342a66 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 f58845692ac..c4065b4c89e 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);