diff options
| author | kientzle <kientzle@FreeBSD.org> | 2008-12-06 06:20:21 +0000 |
|---|---|---|
| committer | kientzle <kientzle@FreeBSD.org> | 2008-12-06 06:20:21 +0000 |
| commit | 15ffc05b52603dbd9dac1ffe377a9d72651b6735 (patch) | |
| tree | 65355f8b1cae5eaf6739127cfb2590335b871bf9 /lib/libarchive | |
| parent | b5c70ed6dfd9b06e10223d0cc00f9ecb3e637043 (diff) | |
| download | FreeBSD-src-15ffc05b52603dbd9dac1ffe377a9d72651b6735.zip FreeBSD-src-15ffc05b52603dbd9dac1ffe377a9d72651b6735.tar.gz | |
Use GCC-specific dead function markers only when using GCC.
Diffstat (limited to 'lib/libarchive')
| -rw-r--r-- | lib/libarchive/archive_private.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/libarchive/archive_private.h b/lib/libarchive/archive_private.h index 87f149f..a434495 100644 --- a/lib/libarchive/archive_private.h +++ b/lib/libarchive/archive_private.h @@ -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)) |
