From: Craig Rodrigues <rodrigc@gcc.gnu.org>
Date: Fri, 2 Sep 2005 01:09:42 +0000 (+0000)
Subject: c-decl.c (diagnose_mismatched_decls): With -Wredundant-decls...
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=52d09157d56d4751646b85a851d4bf6ade2e81b5;p=gcc.git

c-decl.c (diagnose_mismatched_decls): With -Wredundant-decls...

	* c-decl.c (diagnose_mismatched_decls):  With -Wredundant-decls,
	do not issue warning for a variable definition following
	a declaration.

From-SVN: r103758
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ee5537bb718..2ca4920ac96 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-01  Craig Rodrigues  <rodrigc@gcc.gnu.org>
+
+	* c-decl.c (diagnose_mismatched_decls):  With -Wredundant-decls,
+	do not issue warning for a variable definition following
+	a declaration.
+
 2005-09-01  Richard Henderson  <rth@redhat.com>
 
 	PR 23668
diff --git a/gcc/c-decl.c b/gcc/c-decl.c
index 6d60fd09dc6..f3b8d64a6d3 100644
--- a/gcc/c-decl.c
+++ b/gcc/c-decl.c
@@ -1555,7 +1555,10 @@ diagnose_mismatched_decls (tree newdecl, tree olddecl,
       && !(DECL_EXTERNAL (olddecl) && !DECL_EXTERNAL (newdecl))
       /* Don't warn about forward parameter decls.  */
       && !(TREE_CODE (newdecl) == PARM_DECL
-	   && TREE_ASM_WRITTEN (olddecl) && !TREE_ASM_WRITTEN (newdecl)))
+	   && TREE_ASM_WRITTEN (olddecl) && !TREE_ASM_WRITTEN (newdecl))
+      /* Don't warn about a variable definition following a declaration.  */
+      && !(TREE_CODE (newdecl) == VAR_DECL
+	   && DECL_INITIAL (newdecl) && !DECL_INITIAL (olddecl)))
     {
       warning (OPT_Wredundant_decls, "redundant redeclaration of %q+D",
 	       newdecl);