diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2022-10-16 11:00:38 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2022-10-16 11:02:34 -0700 |
| commit | 2ffeff68a6774675b1741655fa7a22c7af93c2ac (patch) | |
| tree | 5a1c6ae730a7781c49a67188c8612c0eaf75473b | |
| parent | 122fa8689837bc5a5166432609f351c200a17ef6 (diff) | |
Mark usage() as _X_NORETURN _X_COLD
Raises minimum xproto requirement to 7.0.25 from Nov. 2013
to get the _X_COLD definition in <X11/Xfuncproto.h>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | xfd.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index d5669be..602b9ca 100644 --- a/configure.ac +++ b/configure.ac @@ -68,7 +68,7 @@ if test x$use_xkb != xno ; then fi # Checks for pkg-config packages -PKG_CHECK_MODULES(XFD, [xaw7 fontconfig xft xrender xmu xproto >= 7.0.17 ${XKBMODULE}]) +PKG_CHECK_MODULES(XFD, [xaw7 fontconfig xft xrender xmu xproto >= 7.0.25 ${XKBMODULE}]) PKG_CHECK_MODULES(APPDEFS, xt) xt_appdefaultdir=`$PKG_CONFIG --variable=appdefaultdir xt` @@ -30,6 +30,7 @@ in this Software without prior written authorization from The Open Group. # include "config.h" #endif +#include <X11/Xfuncproto.h> #include <X11/Intrinsic.h> #include <X11/StringDefs.h> #include <X11/Xos.h> @@ -69,7 +70,7 @@ static XrmOptionDescRec xfd_options[] = { {"-columns", "*grid.cellColumns", XrmoptionSepArg, (caddr_t) NULL }, }; -static void usage(void); +static void usage(void) _X_NORETURN _X_COLD; static void SelectChar(Widget w, XtPointer closure, XtPointer data); static void do_quit(Widget w, XEvent *event, String *params, Cardinal *num_params) _X_NORETURN; |