diff options
| -rw-r--r-- | include/manconfig.h.in | 7 | ||||
| -rw-r--r-- | lib/cleanup.c | 2 | ||||
| -rw-r--r-- | src/man.c | 3 |
3 files changed, 2 insertions, 10 deletions
diff --git a/include/manconfig.h.in b/include/manconfig.h.in index 163d5717..9281f1c2 100644 --- a/include/manconfig.h.in +++ b/include/manconfig.h.in @@ -261,13 +261,6 @@ # define ATTRIBUTE_UNUSED #endif -/* Does this compiler support marking functions as non-returning? */ -#if GNUC_PREREQ(2,5) -# define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__)) -#else -# define ATTRIBUTE_NORETURN -#endif - /* Does this compiler support malloc return checking? */ #if GNUC_PREREQ(2,96) # define ATTRIBUTE_MALLOC __attribute__ ((__malloc__)) diff --git a/lib/cleanup.c b/lib/cleanup.c index 5aa2e501..cf8aec1c 100644 --- a/lib/cleanup.c +++ b/lib/cleanup.c @@ -45,7 +45,7 @@ static struct sigaction saved_term_action; /* Run cleanups, then reraise signal with default handler. */ -static void +static _Noreturn void sighandler (int signo) { struct sigaction act; @@ -2470,8 +2470,7 @@ static int display (const char *dir, const char *man_file, return found; } -static void gripe_converting_name (const char *name) ATTRIBUTE_NORETURN; -static void gripe_converting_name (const char *name) +static _Noreturn void gripe_converting_name (const char *name) { error (FATAL, 0, _("Can't convert %s to cat name"), name); abort (); /* error should have exited; help compilers prove noreturn */ |