From 74b0ec7c400f3ad1e08300ed7d5f79b437ec6b39 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Thu, 26 Jun 2008 16:40:56 +0100 Subject: c-decl.c (merge_decls): Use !current_function_decl to check for extern declaration of C99 inline... * c-decl.c (merge_decls): Use !current_function_decl to check for extern declaration of C99 inline function being at file scope. testsuite: * gcc.dg/inline-32.c, gcc.dg/inline-32a.c: New tests. From-SVN: r137149 --- gcc/c-decl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gcc/c-decl.c') diff --git a/gcc/c-decl.c b/gcc/c-decl.c index 38c1581..18ad119 100644 --- a/gcc/c-decl.c +++ b/gcc/c-decl.c @@ -1764,8 +1764,7 @@ merge_decls (tree newdecl, tree olddecl, tree newtype, tree oldtype) || !DECL_EXTERNAL (olddecl)) && DECL_EXTERNAL (newdecl) && !lookup_attribute ("gnu_inline", DECL_ATTRIBUTES (newdecl)) - && (DECL_CONTEXT (newdecl) == NULL_TREE - || TREE_CODE (DECL_CONTEXT (newdecl)) != FUNCTION_DECL)) + && !current_function_decl) DECL_EXTERNAL (newdecl) = 0; if (DECL_EXTERNAL (newdecl)) -- cgit v1.1