diff options
| author | Martin Jambor <mjambor@suse.cz> | 2017-07-31 14:43:24 +0200 |
|---|---|---|
| committer | Martin Jambor <mjambor@suse.cz> | 2017-07-31 14:43:24 +0200 |
| commit | b32f12dece884f1fa0f04c643a77105aff6ce8bc (patch) | |
| tree | cdab5f10806561fc198f907299b0e55eb5701ef0 /gcc/fortran/symbol.c | |
| parent | 166bec868d991fdf71f9a66f994e5977fcab4aa2 (diff) | |
| parent | a168a775e93ec31ae743ad282d8e60fa1c116891 (diff) | |
| download | gcc-gcn.tar.gz | |
Merge branch 'master' into gcngcn
Diffstat (limited to 'gcc/fortran/symbol.c')
| -rw-r--r-- | gcc/fortran/symbol.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/fortran/symbol.c b/gcc/fortran/symbol.c index ec43e635bf3..3bc2b34768f 100644 --- a/gcc/fortran/symbol.c +++ b/gcc/fortran/symbol.c @@ -845,13 +845,13 @@ conflict: conflict_std: if (name == NULL) { - return gfc_notify_std (standard, "%s attribute " + return gfc_notify_std (standard, "%s attribute conflicts " "with %s attribute at %L", a1, a2, where); } else { - return gfc_notify_std (standard, "%s attribute " + return gfc_notify_std (standard, "%s attribute conflicts " "with %s attribute in %qs at %L", a1, a2, name, where); } |