From owner-svn-src-projects@FreeBSD.ORG  Thu Sep 27 18:52:15 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B3FCD106568F;
	Thu, 27 Sep 2012 18:52:15 +0000 (UTC)
	(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9F84B8FC18;
	Thu, 27 Sep 2012 18:52:15 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8RIqFpK076453;
	Thu, 27 Sep 2012 18:52:15 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8RIqFpw076450;
	Thu, 27 Sep 2012 18:52:15 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201209271852.q8RIqFpw076450@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Thu, 27 Sep 2012 18:52:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r241005 - projects/mtree/contrib/mtree
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Sep 2012 18:52:15 -0000

Author: brooks
Date: Thu Sep 27 18:52:15 2012
New Revision: 241005
URL: http://svn.freebsd.org/changeset/base/241005

Log:
  Revert s/__dead/__dead2/ in r240706.  I'm now using a sys/cdefs.h
  wrapper instead.

Modified:
  projects/mtree/contrib/mtree/extern.h
  projects/mtree/contrib/mtree/mtree.c

Modified: projects/mtree/contrib/mtree/extern.h
==============================================================================
--- projects/mtree/contrib/mtree/extern.h	Thu Sep 27 18:52:04 2012	(r241004)
+++ projects/mtree/contrib/mtree/extern.h	Thu Sep 27 18:52:15 2012	(r241005)
@@ -60,7 +60,7 @@ void	 cwalk(void);
 void	 dump_nodes(const char *, NODE *, int);
 void	 init_excludes(void);
 int	 matchtags(NODE *);
-__dead2 __printflike(1,2) void	 mtree_err(const char *, ...);
+__dead __printflike(1,2) void	 mtree_err(const char *, ...);
 const char *nodetype(u_int);
 u_int	 parsekey(const char *, int *);
 void	 parsetags(slist_t *, char *);

Modified: projects/mtree/contrib/mtree/mtree.c
==============================================================================
--- projects/mtree/contrib/mtree/mtree.c	Thu Sep 27 18:52:04 2012	(r241004)
+++ projects/mtree/contrib/mtree/mtree.c	Thu Sep 27 18:52:15 2012	(r241005)
@@ -63,7 +63,7 @@ int	cflag, Cflag, dflag, Dflag, eflag, i
     	nflag, qflag, rflag, sflag, tflag, uflag, Uflag;
 char	fullpath[MAXPATHLEN];
 
-__dead2 static	void	usage(void);
+__dead static	void	usage(void);
 
 int
 main(int argc, char **argv)