Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[xsrc/trunk]: xsrc/external/mit/xterm update for libXt 1.2.0 const/noreturnif...
details: https://anonhg.NetBSD.org/xsrc/rev/3591e354b095
branches: trunk
changeset: 10333:3591e354b095
user: mrg <mrg%NetBSD.org@localhost>
date: Thu Jul 11 08:08:47 2019 +0000
description:
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
diffstat:
external/mit/xterm/dist/misc.c | 2 +-
external/mit/xterm/dist/xterm.h | 2 +-
external/mit/xterm/include/xtermcfg.h | 8 ++++----
3 files changed, 6 insertions(+), 6 deletions(-)
diffs (42 lines):
diff -r 7c1761e5d28f -r 3591e354b095 external/mit/xterm/dist/misc.c
--- a/external/mit/xterm/dist/misc.c Thu Jul 11 05:43:50 2019 +0000
+++ b/external/mit/xterm/dist/misc.c Thu Jul 11 08:08:47 2019 +0000
@@ -6084,7 +6084,7 @@
#endif /* OPT_SESSION_MGT */
init_colored_cursor(XtDisplay(result));
- XtSetErrorHandler((XtErrorHandler) 0);
+ XtSetErrorHandler(NULL);
return result;
}
diff -r 7c1761e5d28f -r 3591e354b095 external/mit/xterm/dist/xterm.h
--- a/external/mit/xterm/dist/xterm.h Thu Jul 11 05:43:50 2019 +0000
+++ b/external/mit/xterm/dist/xterm.h Thu Jul 11 08:08:47 2019 +0000
@@ -1105,7 +1105,7 @@
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 */);
diff -r 7c1761e5d28f -r 3591e354b095 external/mit/xterm/include/xtermcfg.h
--- a/external/mit/xterm/include/xtermcfg.h Thu Jul 11 05:43:50 2019 +0000
+++ b/external/mit/xterm/include/xtermcfg.h Thu Jul 11 08:08:47 2019 +0000
@@ -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
Home |
Main Index |
Thread Index |
Old Index