Module Name: xsrc
Committed By: mrg
Date: Thu Jul 11 08:08:48 UTC 2019
Modified Files:
xsrc/external/mit/xterm/dist: misc.c xterm.h
xsrc/external/mit/xterm/include: xtermcfg.h
Log Message:
update for libXt 1.2.0 const/noreturnification:
- define GCC_* as supported by all our compilers
- mark xt_error as noreturn
- clear the error handler with XtSetErrorHandler(NULL) vs
((XtErrorHandler) 0) which avoids missing noreturn issue
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 xsrc/external/mit/xterm/dist/misc.c
cvs rdiff -u -r1.1.1.14 -r1.2 xsrc/external/mit/xterm/dist/xterm.h
cvs rdiff -u -r1.12 -r1.13 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.15 xsrc/external/mit/xterm/dist/misc.c:1.16
--- xsrc/external/mit/xterm/dist/misc.c:1.15 Wed Mar 14 06:04:47 2018
+++ xsrc/external/mit/xterm/dist/misc.c Thu Jul 11 08:08:47 2019
@@ -6084,7 +6084,7 @@ xtermOpenApplication(XtAppContext * app_
#endif /* OPT_SESSION_MGT */
init_colored_cursor(XtDisplay(result));
- XtSetErrorHandler((XtErrorHandler) 0);
+ XtSetErrorHandler(NULL);
return result;
}
Index: xsrc/external/mit/xterm/dist/xterm.h
diff -u xsrc/external/mit/xterm/dist/xterm.h:1.1.1.14 xsrc/external/mit/xterm/dist/xterm.h:1.2
--- xsrc/external/mit/xterm/dist/xterm.h:1.1.1.14 Wed Mar 14 06:04:22 2018
+++ xsrc/external/mit/xterm/dist/xterm.h Thu Jul 11 08:08:47 2019
@@ -1105,7 +1105,7 @@ extern void switch_modes (Bool /* tovt *
extern void timestamp_filename(char * /* dst */, const char * /* src */);
extern void update_winsize(int /* fd */, int /* rows */, int /* cols */, int /* height */, int /* width */);
extern void xevents (void);
-extern void xt_error (String /* message */);
+extern void xt_error (String /* message */) GCC_NORETURN;
extern void xtermBell(XtermWidget /* xw */, int /* which */, int /* percent */);
extern void xtermCopyEnv (char ** /* oldenv */);
extern void xtermDisplayCursor (XtermWidget /* xw */);
Index: xsrc/external/mit/xterm/include/xtermcfg.h
diff -u xsrc/external/mit/xterm/include/xtermcfg.h:1.12 xsrc/external/mit/xterm/include/xtermcfg.h:1.13
--- xsrc/external/mit/xterm/include/xtermcfg.h:1.12 Wed Mar 14 06:06:01 2018
+++ xsrc/external/mit/xterm/include/xtermcfg.h Thu Jul 11 08:08:48 2019
@@ -231,10 +231,10 @@
* g++ support for __attribute__() is haphazard.
*/
#ifndef __cplusplus
-/* #undef GCC_PRINTF */
-/* #undef GCC_PRINTFLIKE */
-/* #undef GCC_NORETURN */
-/* #undef GCC_UNUSED */
+#define GCC_PRINTF 1
+#define GCC_PRINTFLIKE(fmt,var) __attribute__((__format__(__printf__,fmt,var)))
+#define GCC_NORETURN __attribute__((__noreturn__))
+#define GCC_UNUSED __attribute__((__unused__))
#endif
#ifndef HAVE_X11_XPOLL_H
