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

From-SVN: r29452

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index dcd12c289c8543df27c97f68509c395774117f41..3a56c48204b79d47ee58778f8f92a2871bdb9eed 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.
+
 Wed Sep 15 10:07:27 1999  Scott Bambrough <scottb@netwinder.org>
  
        * config/arm/linux-elf.h: define NO_IMPLICIT_EXTERN_C

diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c
index 854baf888235aa3305149a016ec5f5999f766a99..154d830a6d012cf45c764b6eaaa13a0cb95ebccf 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.