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.

diff --git a/man_validate.c b/man_validate.c
index d4a0311aadfec96f9d9adce14b37210da870341d..7c10ea5f14ccf1186d484d41294eb860189b2b78 100644 (file)
--- a/man_validate.c
+++ b/man_validate.c
@@ -1,4 +1,4 @@
-/*     $Id: man_validate.c,v 1.147 2019/03/11 13:21:11 schwarze Exp $ */
+/*     $Id: man_validate.c,v 1.148 2019/03/13 18:29:18 schwarze Exp $ */

 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012-2018 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012-2018 Ingo Schwarze <schwarze@openbsd.org>


@@ -41,7 +41,7 @@
 
 typedef        void    (*v_check)(CHKARGS);
 
 
 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);
 static void      check_par(CHKARGS);
 static void      check_part(CHKARGS);
 static void      check_root(CHKARGS);


@@ -196,7 +196,7 @@ check_root(CHKARGS)
                    "(OpenBSD)" : "(NetBSD)");
 }
 
                    "(OpenBSD)" : "(NetBSD)");
 }
 

-static __dead void
+static void

 check_abort(CHKARGS)
 {
        abort();
 check_abort(CHKARGS)
 {
        abort();

diff --git a/mdoc_validate.c b/mdoc_validate.c
index e2cde10c0be6f8f70af1e7afa158ff8c88823f11..c409f90891cf4ca90d9351f893d6e18511e7efee 100644 (file)
--- a/mdoc_validate.c
+++ b/mdoc_validate.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_validate.c,v 1.372 2019/03/11 13:21:11 schwarze Exp $ */
+/*     $Id: mdoc_validate.c,v 1.373 2019/03/13 18:29:18 schwarze Exp $ */

 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2019 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2019 Ingo Schwarze <schwarze@openbsd.org>


@@ -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 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);
 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();
 post_abort(POST_ARGS)
 {
        abort();