Introduce __LA_DEAD to replace current unportable use of

__dead2 as discussed in August.

SVN-Revision: 217

diff --git a/cpio/cpio.h b/cpio/cpio.h
index a4c17108e2d2a65aa291a0802c3f9062aa30a27a..41841f941dff9854876992a04e0a24d6f85fbb4e 100644 (file)
--- a/cpio/cpio.h
+++ b/cpio/cpio.h
@@ -85,7 +85,7 @@ struct cpio {
 /* Name of this program; used in error reporting, initialized in main(). */
 const char *cpio_progname;
 
-void   cpio_errc(int _eval, int _code, const char *fmt, ...) __dead2;
+void   cpio_errc(int _eval, int _code, const char *fmt, ...) __LA_DEAD;
 void   cpio_warnc(int _code, const char *fmt, ...);
 
 int    owner_parse(const char *, int *, int *);

diff --git a/libarchive/archive.h b/libarchive/archive.h
index 8ae1757bdb202ef4a9997c288708f9688f0ad9f6..669ec5903d4c2fbc2f8bf919c70e34a8c9912762 100644 (file)
--- a/libarchive/archive.h
+++ b/libarchive/archive.h
@@ -82,6 +82,13 @@
 # define __LA_DECL
 #endif
 
+#if defined(__GNUC__) && (__GNUC__ > 2 || \
+                         (__GNUC__ == 2 && __GNUC_MINOR__ >= 5))
+#define        __LA_DEAD       __attribute__((__noreturn__))
+#else
+#define        __LA_DEAD
+#endif
+
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/libarchive/archive_private.h b/libarchive/archive_private.h
index a859417a6d96997e73ff7d945a62dfea3a2200c1..9e5d0dac0f3b5f5b6f92a9ff0735d69e6695cd71 100644 (file)
--- a/libarchive/archive_private.h
+++ b/libarchive/archive_private.h
@@ -92,7 +92,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))
 

diff --git a/tar/bsdtar.h b/tar/bsdtar.h
index 59f24c20e62eff625b5995d3e99cd1f9bf168074..fb256d8dfc4ac73fd42dd0d0ac707b750cf253c5 100644 (file)
--- a/tar/bsdtar.h
+++ b/tar/bsdtar.h
@@ -103,7 +103,7 @@ struct bsdtar {
 };
 
 void   bsdtar_errc(struct bsdtar *, int _eval, int _code,
-           const char *fmt, ...) __dead2;
+           const char *fmt, ...) __LA_DEAD;
 void   bsdtar_warnc(struct bsdtar *, int _code, const char *fmt, ...);
 void   cleanup_exclusions(struct bsdtar *);
 void   do_chdir(struct bsdtar *);