From owner-svn-src-head@FreeBSD.ORG  Sat Dec  6 06:20:21 2008
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 6CCD4106564A;
	Sat,  6 Dec 2008 06:20:21 +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 5BB8B8FC08;
	Sat,  6 Dec 2008 06:20:21 +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 mB66KLwN085268;
	Sat, 6 Dec 2008 06:20:21 GMT (envelope-from kientzle@svn.freebsd.org)
Received: (from kientzle@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mB66KLpp085267;
	Sat, 6 Dec 2008 06:20:21 GMT (envelope-from kientzle@svn.freebsd.org)
Message-Id: <200812060620.mB66KLpp085267@svn.freebsd.org>
From: Tim Kientzle <kientzle@FreeBSD.org>
Date: Sat, 6 Dec 2008 06:20:21 +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: r185677 - head/lib/libarchive
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: Sat, 06 Dec 2008 06:20:21 -0000

Author: kientzle
Date: Sat Dec  6 06:20:21 2008
New Revision: 185677
URL: http://svn.freebsd.org/changeset/base/185677

Log:
  Use GCC-specific dead function markers only when using GCC.

Modified:
  head/lib/libarchive/archive_private.h

Modified: head/lib/libarchive/archive_private.h
==============================================================================
--- head/lib/libarchive/archive_private.h	Sat Dec  6 06:18:46 2008	(r185676)
+++ head/lib/libarchive/archive_private.h	Sat Dec  6 06:20:21 2008	(r185677)
@@ -31,6 +31,13 @@
 #include "archive.h"
 #include "archive_string.h"
 
+#if defined(__GNUC__) && (__GNUC__ > 2 || \
+			  (__GNUC__ == 2 && __GNUC_MINOR__ >= 5))
+#define	__LA_DEAD	__attribute__((__noreturn__))
+#else
+#define	__LA_DEAD
+#endif
+
 #define	ARCHIVE_WRITE_MAGIC	(0xb0c5c0deU)
 #define	ARCHIVE_READ_MAGIC	(0xdeb0c5U)
 #define ARCHIVE_WRITE_DISK_MAGIC (0xc001b0c5U)
@@ -92,7 +99,7 @@ struct archive {
 void	__archive_check_magic(struct archive *, unsigned int magic,
 	    unsigned int state, const char *func);
 
-void	__archive_errx(int retvalue, const char *msg) __dead2;
+void	__archive_errx(int retvalue, const char *msg) __LA_DEAD;
 
 #define	err_combine(a,b)	((a) < (b) ? (a) : (b))