diff options
| author | Ingo Schwarze <schwarze@openbsd.org> | 2019-03-13 18:29:18 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2019-03-13 18:29:18 +0000 |
| commit | f71645a33de1fd3613e7f15842ede47c7492d79e (patch) | |
| tree | e06331665f2ce8df37149f6cc6b29369cf941d84 | |
| parent | 42b47b2c3ba1a93eb0d533fafeb94e04c29e504d (diff) | |
| download | mandoc-f71645a33de1fd3613e7f15842ede47c7492d79e.tar.gz | |
Contrary to what the NetBSD attribute(3) manual page suggests,
using __dead instead of __attribute__((__noreturn__)) actually
hinders portability rather than helping it.
Given that mandoc already uses __attribute__ in several files
and that in the portable version, ./configure already contains
rudimentary support for ignoring it on platforms that do not
support it, use __attribute__ directly.
This is expected to fix build failures that Stephen Gregoratto
<dev at sgregoratto dot me> reported from Arch and Debian Linux.
| -rw-r--r-- | man_validate.c | 4 | ||||
| -rw-r--r-- | mdoc_validate.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/man_validate.c b/man_validate.c index dcae5ce3..55ac13a8 100644 --- a/man_validate.c +++ b/man_validate.c @@ -41,7 +41,7 @@ typedef void (*v_check)(CHKARGS); -static __dead void check_abort(CHKARGS); +static void check_abort(CHKARGS) __attribute__((__noreturn__)); static void check_par(CHKARGS); static void check_part(CHKARGS); static void check_root(CHKARGS); @@ -196,7 +196,7 @@ check_root(CHKARGS) "(OpenBSD)" : "(NetBSD)"); } -static __dead void +static void check_abort(CHKARGS) { abort(); diff --git a/mdoc_validate.c b/mdoc_validate.c index 4b76c262..14fbf828 100644 --- a/mdoc_validate.c +++ b/mdoc_validate.c @@ -64,7 +64,7 @@ static size_t macro2len(enum roff_tok); static void rewrite_macro2len(struct roff_man *, char **); static int similar(const char *, const char *); -static __dead void post_abort(POST_ARGS); +static void post_abort(POST_ARGS) __attribute__((__noreturn__)); static void post_an(POST_ARGS); static void post_an_norm(POST_ARGS); static void post_at(POST_ARGS); @@ -497,7 +497,7 @@ check_toptext(struct roff_man *mdoc, int ln, int pos, const char *p) } } -static __dead void +static void post_abort(POST_ARGS) { abort(); |