diff options
Diffstat (limited to 'libarchive_fe/err.h')
| -rw-r--r-- | libarchive_fe/err.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libarchive_fe/err.h b/libarchive_fe/err.h index c663103b0b44..bd9281539693 100644 --- a/libarchive_fe/err.h +++ b/libarchive_fe/err.h @@ -27,10 +27,12 @@ #define LAFE_ERR_H #if defined(__GNUC__) && (__GNUC__ > 2 || \ - (__GNUC__ == 2 && __GNUC_MINOR__ >= 5)) -#define __LA_DEAD __attribute__((__noreturn__)) + (__GNUC__ == 2 && __GNUC_MINOR__ >= 5)) +#define __LA_NORETURN __attribute__((__noreturn__)) +#elif defined(_MSC_VER) +#define __LA_NORETURN __declspec(noreturn) #else -#define __LA_DEAD +#define __LA_NORETURN #endif #if defined(__GNUC__) && (__GNUC__ > 2 || \ @@ -46,8 +48,7 @@ #endif void lafe_warnc(int code, const char *fmt, ...) __LA_PRINTFLIKE(2, 3); -void lafe_errc(int eval, int code, const char *fmt, ...) __LA_DEAD - __LA_PRINTFLIKE(3, 4); +__LA_NORETURN void lafe_errc(int eval, int code, const char *fmt, ...) __LA_PRINTFLIKE(3, 4); const char * lafe_getprogname(void); void lafe_setprogname(const char *name, const char *defaultname); |