From 5eca8160b554a0ee6d66be187fcaa2c46ccad633 Mon Sep 17 00:00:00 2001 From: Tim Kientzle Date: Sat, 6 Dec 2008 07:15:42 +0000 Subject: [PATCH] Make the GCC-specific __dead2 markers conditional on whether we're compiling under GCC. --- usr.bin/cpio/cpio.h | 2 +- usr.bin/cpio/cpio_platform.h | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/usr.bin/cpio/cpio.h b/usr.bin/cpio/cpio.h index 9af8a090db7d..e85345d1b71f 100644 --- a/usr.bin/cpio/cpio.h +++ b/usr.bin/cpio/cpio.h @@ -89,7 +89,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/usr.bin/cpio/cpio_platform.h b/usr.bin/cpio/cpio_platform.h index 314519829827..c251fa439fd4 100644 --- a/usr.bin/cpio/cpio_platform.h +++ b/usr.bin/cpio/cpio_platform.h @@ -81,4 +81,12 @@ #endif #endif +/* How to mark functions that don't return. */ +#if defined(__GNUC__) && (__GNUC__ > 2 || \ + (__GNUC__ == 2 && __GNUC_MINOR__ >= 5)) +#define __LA_DEAD __attribute__((__noreturn__)) +#else +#define __LA_DEAD +#endif + #endif /* !CPIO_PLATFORM_H_INCLUDED */