summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac2
-rw-r--r--xfd.c3
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`
diff --git a/xfd.c b/xfd.c
index 14f0e4a..7df3ae5 100644
--- a/xfd.c
+++ b/xfd.c
@@ -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;