c-decl.c (store_parm_decls_newstyle): Correct test for a nested function.

	* c-decl.c (store_parm_decls_newstyle): Correct test for a
	nested function.

From-SVN: r81677

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 36330b7e02d6f1353c91b5937345904e16ffc206..43f568264f44ffc867b659dcaa5ff756d9cb1935 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-10  Zack Weinberg  <zack@codesourcery.com>
+
+       * c-decl.c (store_parm_decls_newstyle): Correct test for a
+       nested function.
+
 2004-05-10  Richard Sandiford  <rsandifo@redhat.com>
 
        * read-rtl.c (read_rtx): Allow 's' and 'T' strings to be omitted,
@@ -35,7 +40,7 @@
        * config/rs6000/rs6000.c (function_arg_boundary): Align for ABI_V4
        when size is 8 bytes.
        (function_arg_advance): Account for stack space used by AltiVec
-       args when -mabi=altivec.  Simplify alignment calculations.  For 
+       args when -mabi=altivec.  Simplify alignment calculations.  For
        ABI_V4, pass AltiVec vectors by reference when -mabi=no-altivec.
        (function_arg): Similarly.
        (function_arg_pass_by_reference): True for ABI_V4 AltiVec when

diff --git a/gcc/c-decl.c b/gcc/c-decl.c
index 3889726d492cbcba8c5257856cd415a8cc512da3..b03ba809e3cf4a9c9a7e506e7c06c486b52d0675 100644 (file)
--- a/gcc/c-decl.c
+++ b/gcc/c-decl.c
@@ -5828,8 +5828,7 @@ store_parm_decls_newstyle (tree fndecl, tree arg_info)
      warning if we got here because ARG_INFO_TYPES was error_mark_node
      (this happens when a function definition has just an ellipsis in
      its parameter list).  */
-  else if (warn_traditional && !in_system_header
-          && !current_scope->outer_function
+  else if (warn_traditional && !in_system_header && !current_function_scope
           && ARG_INFO_TYPES (arg_info) != error_mark_node)
     warning ("%Jtraditional C rejects ISO C style function definitions",
             fndecl);