summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2013-02-17 10:25:18 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2013-02-17 10:25:18 -0800
commit7e5c3cdddeee730dff2b464de558954344d55892 (patch)
treed41266ab866a2701f26340792ffba628f3ef487c
parent78ee6607ca35319c4785c5c48f7eed618e56d7d0 (diff)
Mark do_quit as noreturn, as suggested by gcc & clang
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--configure.ac2
-rw-r--r--xfd.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 6b24bfe..c2472e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,7 +59,7 @@ fi
AM_CONDITIONAL(USE_GETTEXT, test "x$USE_GETTEXT" = "xyes")
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XFD, xaw7 fontconfig xft xrender xmu)
+PKG_CHECK_MODULES(XFD, [xaw7 fontconfig xft xrender xmu xproto >= 7.0.17])
PKG_CHECK_MODULES(APPDEFS, xt)
xt_appdefaultdir=`$PKG_CONFIG --variable=appdefaultdir xt`
diff --git a/xfd.c b/xfd.c
index 18f262f..3ffd84a 100644
--- a/xfd.c
+++ b/xfd.c
@@ -72,7 +72,7 @@ static XrmOptionDescRec xfd_options[] = {
static void usage(void);
static void SelectChar(Widget w, XtPointer closure, XtPointer data);
static void do_quit(Widget w, XEvent *event, String *params,
- Cardinal *num_params);
+ Cardinal *num_params) _X_NORETURN;
static void change_page(int page);
static void set_button_state(void);
static void do_prev(Widget w, XEvent *event, String *params,