2007-01-05 Tobias Burnus <burnus@net-b.de>

       * symbol.c (check_conflict): Fix error message.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@120496 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 0d9ade0..c574dc4 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,7 @@
+2007-01-05  Tobias Burnus  <burnus@net-b.de>
+
+       * symbol.c (check_conflict): Fix error message.
+

 2007-01-05  Paul Thomas  <pault@gcc.gnu.org>
 
        PR fortran/23232
 2007-01-05  Paul Thomas  <pault@gcc.gnu.org>
 
        PR fortran/23232

diff --git a/gcc/fortran/symbol.c b/gcc/fortran/symbol.c
index a1aaae8..85aff86 100644 (file)
--- 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 "
   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
                              where);
     }
   else