* c-typeck.c (qualify_type): Merge qualifiers from both types.

From-SVN: r29451

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ca9080695cb93a6a0511b8668fd163da2668b6c6..6e7c2487c22e93eb151bd46d385d28f8f4e3b7be 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+Wed Sep 15 21:20:38 1999  Mark Mitchell  <mark@codesourcery.com>
+
+       * c-typeck.c (qualify_type): Merge qualifiers from both types.
+
 1999-09-15  Brad Lucier  <lucier@math.purdue.edu>
 
        * toplev.c: Allow -f[no-]math-errno to set (clear) flag_errno_math

diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c
index 7d9352a27d9d25dadf6a106554697027c765a117..e27f0f67238f059418e574091799ae0cd510899e 100644 (file)
--- a/gcc/c-typeck.c
+++ b/gcc/c-typeck.c
@@ -167,7 +167,8 @@ static tree
 qualify_type (type, like)
      tree type, like;
 {
-  return c_build_qualified_type (type, TYPE_QUALS (like));
+  return c_build_qualified_type (type, 
+                                TYPE_QUALS (type) | TYPE_QUALS (like));
 }
 \f
 /* Return the common type of two types.