diff options
| author | Mark Mitchell <mark@codesourcery.com> | 1999-09-16 04:16:32 +0000 |
|---|---|---|
| committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 1999-09-16 04:16:32 +0000 |
| commit | afbadaa70142eb2bd4aa91103d236c3b5b59945d (patch) | |
| tree | 2c3e061bde34f35c1fb71f5fee681939875ecb36 /gcc | |
| parent | 24f30ed448cf01c0fc89f75ea711fa04440beefc (diff) | |
| download | gcc-afbadaa70142eb2bd4aa91103d236c3b5b59945d.zip gcc-afbadaa70142eb2bd4aa91103d236c3b5b59945d.tar.gz gcc-afbadaa70142eb2bd4aa91103d236c3b5b59945d.tar.bz2 | |
* c-typeck.c (qualify_type): Merge qualifiers from both types.
From-SVN: r29451
Diffstat (limited to 'gcc')
| -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 ca90806..6e7c248 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 7d9352a..e27f0f6 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. |