diff options
| author | Mark Mitchell <mark@codesourcery.com> | 1999-09-16 04:17:52 +0000 |
|---|---|---|
| committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 1999-09-16 04:17:52 +0000 |
| commit | 4a4ff2991c1ab084e8a9b87cf5ae755a2c58765a (patch) | |
| tree | 1ab19da622806d21d323e2240215a02963b59e93 | |
| parent | 01964d5617ca37f8ee84201f9855dd5af01b30d9 (diff) | |
| download | gcc-4a4ff2991c1ab084e8a9b87cf5ae755a2c58765a.tar.gz | |
* c-typeck.c (qualify_type): Merge qualifiers from both types.
From-SVN: r29452
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/c-typeck.c | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index dcd12c289c8..3a56c48204b 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 854baf88823..154d830a6d0 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. |