From afbadaa70142eb2bd4aa91103d236c3b5b59945d Mon Sep 17 00:00:00 2001
From: Mark Mitchell <mark@codesourcery.com>
Date: Thu, 16 Sep 1999 04:16:32 +0000
Subject: [PATCH] * c-typeck.c (qualify_type): Merge qualifiers from both
 types.

From-SVN: r29451
---
 gcc/ChangeLog  | 4 ++++
 gcc/c-typeck.c | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ca9080695cb9..6e7c2487c22e 100644
--- 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 7d9352a27d9d..e27f0f67238f 100644
--- 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));
 }
 
 /* Return the common type of two types.