diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2008-06-26 16:40:56 +0100 |
|---|---|---|
| committer | Joseph Myers <jsm28@gcc.gnu.org> | 2008-06-26 16:40:56 +0100 |
| commit | 74b0ec7c400f3ad1e08300ed7d5f79b437ec6b39 (patch) | |
| tree | 711e931b0478d086e57364a8c0a134cb4a3301d7 /gcc/c-decl.c | |
| parent | 30551d999a73fe2451dde20159132e87b7c33e91 (diff) | |
| download | gcc-74b0ec7c400f3ad1e08300ed7d5f79b437ec6b39.zip gcc-74b0ec7c400f3ad1e08300ed7d5f79b437ec6b39.tar.gz gcc-74b0ec7c400f3ad1e08300ed7d5f79b437ec6b39.tar.bz2 | |
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
Diffstat (limited to 'gcc/c-decl.c')
| -rw-r--r-- | gcc/c-decl.c | 3 |
1 files changed, 1 insertions, 2 deletions
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)) |