[xsrc/trunk]: xsrc/external/mit/xterm revert previous, do it differently and ...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/xsrc/rev/c4728eb953ef
branches:  trunk
changeset: 10716:c4728eb953ef
user:      christos <christos%NetBSD.org@localhost>
date:      Mon May 10 12:29:11 2021 +0000

description:
revert previous, do it differently and explain why.

diffstat:

 external/mit/xterm/dist/misc.c        |  2 +-
 external/mit/xterm/include/xtermcfg.h |  9 +++++++++
 2 files changed, 10 insertions(+), 1 deletions(-)

diffs (32 lines):

diff -r fbaea2b95db8 -r c4728eb953ef external/mit/xterm/dist/misc.c
--- a/external/mit/xterm/dist/misc.c    Sun May 09 16:58:57 2021 +0000
+++ b/external/mit/xterm/dist/misc.c    Mon May 10 12:29:11 2021 +0000
@@ -6563,7 +6563,7 @@
     return 0;                  /* appease the compiler */
 }
 
-void _X_NORETURN
+void
 xt_error(String message)
 {
     xtermWarning("Xt error: %s\n", message);
diff -r fbaea2b95db8 -r c4728eb953ef external/mit/xterm/include/xtermcfg.h
--- a/external/mit/xterm/include/xtermcfg.h     Sun May 09 16:58:57 2021 +0000
+++ b/external/mit/xterm/include/xtermcfg.h     Mon May 10 12:29:11 2021 +0000
@@ -98,7 +98,16 @@
 #define HAVE_SETPGID 1         /* AC_CHECK_FUNCS(setpgid) */
 #define HAVE_STDINT_H 1                /* AC_PROG_CC_STDC */
 #define HAVE_STDLIB_H 1                /* AC_CHECK_HEADERS(stdlib.h) */
+#if 0
+/*
+ * clang treats _Noreturn and __attribute__((__noreturn__)) differently,
+ * so we end up labeling xt_error() with _Noreturn and using it in
+ * XtSetErrorHandler which is marked with the attribute noreturn, and clang
+ * complains. IMHO this is a bug in clang. We tell everyone that we don't
+ * have the header, so we use the attribute consistently and everyone is happy.
+ */
 #define HAVE_STDNORETURN_H 1           /* CF_C11_NORETURN */
+#endif
 #define HAVE_STRFTIME 1                /* AC_CHECK_FUNCS(strftime) */
 /* #undef HAVE_SYS_TIME_H */           /* AC_HEADER_TIME */
 #define HAVE_SYS_TTYDEFAULTS_H 1       /* AC_CHECK_HEADERS(sys/ttydefaults.h) */