From 57767d22b71676485e30bc7a3289db80ed997046 Mon Sep 17 00:00:00 2001 From: burnus Date: Fri, 5 Jan 2007 20:26:00 +0000 Subject: [PATCH] 2007-01-05 Tobias Burnus * symbol.c (check_conflict): Fix error message. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@120496 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/fortran/ChangeLog | 4 ++++ gcc/fortran/symbol.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 0d9ade0da9d8..c574dc42f23d 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,7 @@ +2007-01-05 Tobias Burnus + + * symbol.c (check_conflict): Fix error message. + 2007-01-05 Paul Thomas PR fortran/23232 diff --git a/gcc/fortran/symbol.c b/gcc/fortran/symbol.c index a1aaae8fddff..85aff8674a4b 100644 --- a/gcc/fortran/symbol.c +++ b/gcc/fortran/symbol.c @@ -573,7 +573,7 @@ conflict_std: if (name == NULL) { return gfc_notify_std (standard, "Fortran 2003: %s attribute " - "conflicts with %s attribute at %L", a1, a2, + "with %s attribute at %L", a1, a2, where); } else -- 2.47.3