From owner-svn-src-head@FreeBSD.ORG  Wed Mar 25 05:10:33 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 48645106566B;
	Wed, 25 Mar 2009 05:10:33 +0000 (UTC) (envelope-from das@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 372C58FC15;
	Wed, 25 Mar 2009 05:10:33 +0000 (UTC) (envelope-from das@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2P5AXHQ066390;
	Wed, 25 Mar 2009 05:10:33 GMT (envelope-from das@svn.freebsd.org)
Received: (from das@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2P5AXgD066389;
	Wed, 25 Mar 2009 05:10:33 GMT (envelope-from das@svn.freebsd.org)
Message-Id: <200903250510.n2P5AXgD066389@svn.freebsd.org>
From: David Schultz <das@FreeBSD.org>
Date: Wed, 25 Mar 2009 05:10:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r190404 - head/contrib/gcc
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Mar 2009 05:10:33 -0000

Author: das
Date: Wed Mar 25 05:10:32 2009
New Revision: 190404
URL: http://svn.freebsd.org/changeset/base/190404

Log:
  Merge an important change that I mistakenly left out when merging C99
  inline function support. This should fix instances where gcc
  spuriously reports the following error:
  
      error: nested function 'foo' declared but never defined

Modified:
  head/contrib/gcc/c-decl.c

Modified: head/contrib/gcc/c-decl.c
==============================================================================
--- head/contrib/gcc/c-decl.c	Wed Mar 25 03:42:49 2009	(r190403)
+++ head/contrib/gcc/c-decl.c	Wed Mar 25 05:10:32 2009	(r190404)
@@ -798,7 +798,9 @@ pop_scope (void)
 	      && DECL_ABSTRACT_ORIGIN (p) != p)
 	    TREE_ADDRESSABLE (DECL_ABSTRACT_ORIGIN (p)) = 1;
 	  if (!DECL_EXTERNAL (p)
-	      && DECL_INITIAL (p) == 0)
+	      && DECL_INITIAL (p) == 0
+	      && scope != file_scope
+	      && scope != external_scope)
 	    {
 	      error ("nested function %q+D declared but never defined", p);
 	      undef_nested_function = true;