* src/SDCCsymt.c (computeType): fixed bug, thanks Fan Weiguang

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

diff --git a/ChangeLog b/ChangeLog
index 5f3d8c843f78ce4c25dc547709f534df678a774b..ded25afae8880d132637708faade990e275fb8b3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-20 Maarten Brock <sourceforge.brock AT dse.nl>
+
+       * src/SDCCsymt.c (computeType): fixed bug, thanks Fan Weiguang
+
 2007-12-16 Borut Razem <borut.razem AT siol.net>
 
        * device/include/pic16/stdbool.h: removed, since already exists in

diff --git a/src/SDCCsymt.c b/src/SDCCsymt.c
index 9257c4d2be55f167ca78dac5080d0d851d28aebb..755683574e86a3b55f63832107b52a87eeb73102 100644 (file)
--- a/src/SDCCsymt.c
+++ b/src/SDCCsymt.c
@@ -1869,7 +1869,7 @@ computeType (sym_link * type1, sym_link * type2,
   /* if both are bitvars choose the larger one */
   else if (IS_BITVAR (etype1) && IS_BITVAR (etype2))
     rType = SPEC_BLEN (etype1) >= SPEC_BLEN (etype2) ?
-            copyLinkChain (type1) : copyLinkChain (type1);
+            copyLinkChain (type1) : copyLinkChain (type2);
 
   /* if only one of them is a bit variable then the other one prevails */
   else if (IS_BITVAR (etype1) && !IS_BITVAR (etype2))