* src/SDCCast.c (decorateType): fixed bug 1124787

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@3684 4a8a32a2-be11-0410-ad9d-d568d2c75423

diff --git a/ChangeLog b/ChangeLog
index 6062189a1b72508e05b5d856ab2f9a7a99c14305..bfbbc86afd83e8c571822cd3ad67fc32fa3936f1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-02-22 Maarten Brock <sourceforge.brock AT dse.nl>
+
+       * src/SDCCast.c (decorateType): fixed bug 1124787
+
 2004-02-20 Hubert Sack <sack AT digiplan.de>
        committed by Frieder Ferlemann <Frieder.Ferlemann AT web.de>
 

diff --git a/src/SDCCast.c b/src/SDCCast.c
index 84a6c7f1bd914cc6cefe33102ed847ab8f729bc8..f872f88c25fcb58d6b34ce0c6a191e919c118639 100644 (file)
--- a/src/SDCCast.c
+++ b/src/SDCCast.c
@@ -3933,7 +3933,8 @@ decorateType (ast * tree, RESULT_TYPE resultType)
 
     case ':':
       /* if they don't match we have a problem */
-      if (compareType (LTYPE (tree), RTYPE (tree)) == 0)
+      if ((compareType (LTYPE (tree), RTYPE (tree)) == 0) &&
+          (compareType (RTYPE (tree), LTYPE (tree)) == 0))
         {
           werror (E_TYPE_MISMATCH, "conditional operator", " ");
           goto errorTreeReturn;