From df0ed6c5a308540cb3869bdc32c671e8ab509347 Mon Sep 17 00:00:00 2001 From: Rafael Avila de Espindola Date: Mon, 14 Jul 2008 21:41:27 +0000 Subject: [PATCH] objc-act.c (synth_module_prologue): Use TREE_NO_WARNING instead of DECL_IN_SYSTEM_HEADER. 2007-07-14 Rafael Avila de Espindola * objc-act.c (synth_module_prologue): Use TREE_NO_WARNING instead of DECL_IN_SYSTEM_HEADER. 2007-07-14 Rafael Avila de Espindola * c-decl.c (diagnose_mismatched_decls): Don't warn if TREE_NO_WARNING is set. From-SVN: r137802 --- gcc/ChangeLog | 5 +++++ gcc/c-decl.c | 5 ++++- gcc/objc/ChangeLog | 5 +++++ gcc/objc/objc-act.c | 4 ++-- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2c9f3cc2595..b828d37728a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2007-07-14 Rafael Avila de Espindola + + * c-decl.c (diagnose_mismatched_decls): Don't warn if TREE_NO_WARNING + is set. + 2008-07-14 Jan Hubicka * i386.md (sse5 cmov pattern): Update call of ix86_sse5_valid_op_p diff --git a/gcc/c-decl.c b/gcc/c-decl.c index 0f190e12be8..89430cbf3e1 100644 --- a/gcc/c-decl.c +++ b/gcc/c-decl.c @@ -1258,7 +1258,10 @@ diagnose_mismatched_decls (tree newdecl, tree olddecl, header. (Conflicting redeclarations were handled above.) */ if (TREE_CODE (newdecl) == TYPE_DECL) { - if (DECL_IN_SYSTEM_HEADER (newdecl) || DECL_IN_SYSTEM_HEADER (olddecl)) + if (DECL_IN_SYSTEM_HEADER (newdecl) + || DECL_IN_SYSTEM_HEADER (olddecl) + || TREE_NO_WARNING (newdecl) + || TREE_NO_WARNING (olddecl)) return true; /* Allow OLDDECL to continue in use. */ error ("redefinition of typedef %q+D", newdecl); diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog index 18a548da635..6ebf4b14348 100644 --- a/gcc/objc/ChangeLog +++ b/gcc/objc/ChangeLog @@ -1,3 +1,8 @@ +2007-07-14 Rafael Avila de Espindola + + * objc-act.c (synth_module_prologue): Use TREE_NO_WARNING instead + of DECL_IN_SYSTEM_HEADER. + 2008-07-11 Ian Lance Taylor * objc-act.c (objc_is_reserved_word): Always check for RID_CLASS, diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c index 822dd35eb8d..6d338a04ec6 100644 --- a/gcc/objc/objc-act.c +++ b/gcc/objc/objc-act.c @@ -1552,11 +1552,11 @@ synth_module_prologue (void) type = lang_hooks.decls.pushdecl (build_decl (TYPE_DECL, objc_object_name, objc_object_type)); - DECL_IN_SYSTEM_HEADER (type) = 1; + TREE_NO_WARNING (type) = 1; type = lang_hooks.decls.pushdecl (build_decl (TYPE_DECL, objc_class_name, objc_class_type)); - DECL_IN_SYSTEM_HEADER (type) = 1; + TREE_NO_WARNING (type) = 1; /* Forward-declare '@interface Protocol'. */ -- 2.30.2