From owner-svn-src-all@FreeBSD.ORG  Sat Dec  6 07:37:15 2008
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 059861065731;
	Sat,  6 Dec 2008 07:37:15 +0000 (UTC)
	(envelope-from kientzle@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E819E8FC08;
	Sat,  6 Dec 2008 07:37:14 +0000 (UTC)
	(envelope-from kientzle@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 mB67bEAr087093;
	Sat, 6 Dec 2008 07:37:14 GMT (envelope-from kientzle@svn.freebsd.org)
Received: (from kientzle@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mB67bEAT087091;
	Sat, 6 Dec 2008 07:37:14 GMT (envelope-from kientzle@svn.freebsd.org)
Message-Id: <200812060737.mB67bEAT087091@svn.freebsd.org>
From: Tim Kientzle <kientzle@FreeBSD.org>
Date: Sat, 6 Dec 2008 07:37:14 +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: r185686 - head/usr.bin/tar
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Dec 2008 07:37:15 -0000

Author: kientzle
Date: Sat Dec  6 07:37:14 2008
New Revision: 185686
URL: http://svn.freebsd.org/changeset/base/185686

Log:
  Only use GCC-specific __dead2 marker when building with GCC.

Modified:
  head/usr.bin/tar/bsdtar.h
  head/usr.bin/tar/bsdtar_platform.h

Modified: head/usr.bin/tar/bsdtar.h
==============================================================================
--- head/usr.bin/tar/bsdtar.h	Sat Dec  6 07:30:40 2008	(r185685)
+++ head/usr.bin/tar/bsdtar.h	Sat Dec  6 07:37:14 2008	(r185686)
@@ -131,7 +131,7 @@ enum {
 
 
 void	bsdtar_errc(struct bsdtar *, int _eval, int _code,
-	    const char *fmt, ...) __dead2;
+	    const char *fmt, ...) __LA_DEAD;
 int	bsdtar_getopt(struct bsdtar *);
 void	bsdtar_warnc(struct bsdtar *, int _code, const char *fmt, ...);
 void	cleanup_exclusions(struct bsdtar *);

Modified: head/usr.bin/tar/bsdtar_platform.h
==============================================================================
--- head/usr.bin/tar/bsdtar_platform.h	Sat Dec  6 07:30:40 2008	(r185685)
+++ head/usr.bin/tar/bsdtar_platform.h	Sat Dec  6 07:37:14 2008	(r185686)
@@ -147,4 +147,14 @@
 #endif
 #endif
 
+/* How to mark functions that don't return. */
+/* This facilitates use of some newer static code analysis tools. */
+#undef __LA_DEAD
+#if defined(__GNUC__) && (__GNUC__ > 2 || \
+			  (__GNUC__ == 2 && __GNUC_MINOR__ >= 5))
+#define	__LA_DEAD	__attribute__((__noreturn__))
+#else
+#define	__LA_DEAD
+#endif
+
 #endif /* !BSDTAR_PLATFORM_H_INCLUDED */