Module Name: xsrc
Committed By: christos
Date: Mon May 10 12:29:12 UTC 2021
Modified Files:
xsrc/external/mit/xterm/dist: misc.c
xsrc/external/mit/xterm/include: xtermcfg.h
Log Message:
revert previous, do it differently and explain why.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 xsrc/external/mit/xterm/dist/misc.c
cvs rdiff -u -r1.17 -r1.18 xsrc/external/mit/xterm/include/xtermcfg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xterm/dist/misc.c
diff -u xsrc/external/mit/xterm/dist/misc.c:1.19 xsrc/external/mit/xterm/dist/misc.c:1.20
--- xsrc/external/mit/xterm/dist/misc.c:1.19 Sun May 9 12:55:36 2021
+++ xsrc/external/mit/xterm/dist/misc.c Mon May 10 08:29:11 2021
@@ -6563,7 +6563,7 @@ xioerror(Display *dpy)
return 0; /* appease the compiler */
}
-void _X_NORETURN
+void
xt_error(String message)
{
xtermWarning("Xt error: %s\n", message);
Index: xsrc/external/mit/xterm/include/xtermcfg.h
diff -u xsrc/external/mit/xterm/include/xtermcfg.h:1.17 xsrc/external/mit/xterm/include/xtermcfg.h:1.18
--- xsrc/external/mit/xterm/include/xtermcfg.h:1.17 Mon Apr 26 22:11:31 2021
+++ xsrc/external/mit/xterm/include/xtermcfg.h Mon May 10 08:29:11 2021
@@ -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) */
