From: Mark Mitchell <mark@codesourcery.com>
Date: Thu, 16 Sep 1999 04:17:52 +0000 (+0000)
Subject: * c-typeck.c (qualify_type): Merge qualifiers from both types.
X-Git-Tag: releases/gcc-2.95.2~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a4ff2991c1ab084e8a9b87cf5ae755a2c58765a;p=thirdparty%2Fgcc.git

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

From-SVN: r29452
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index dcd12c289c85..3a56c48204b7 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.
+
 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 854baf888235..154d830a6d01 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.