diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/c-typeck.c | 11 |
2 files changed, 11 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 3573ee2..68b4b56 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2004-05-29 Joseph S. Myers <jsm@polyomino.org.uk> + + * c-typeck.c (common_type): Correct comment. + 2004-05-29 Peter Barada <peter@the-baradas.com> * config/m68k/m68k.c (CONST_METHOD): Add MVZ, MVS. diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c index ddc2d08..1193f05 100644 --- a/gcc/c-typeck.c +++ b/gcc/c-typeck.c @@ -199,10 +199,13 @@ qualify_type (tree type, tree like) TYPE_QUALS (type) | TYPE_QUALS (like)); } -/* Return the common type of two types. - We assume that comptypes has already been done and returned 1; - if that isn't so, this may crash. In particular, we assume that qualifiers - match. +/* Return the composite type of two compatible types, or the common + type for two arithmetic types under the usual arithmetic + conversions. + + Unless both types are arithmetic types, we assume that comptypes + has already been done and returned 1; if that isn't so, this may + crash. In particular, we assume that qualifiers match. This is the type for the result of most arithmetic operations if the operands have the given two types. */ |