summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2013-05-17 21:21:31 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2013-05-17 21:21:31 -0700
commita5ae058401d073d1af80214133fbe7f9a9cecbdb (patch)
treea5c4f444c32cea06e1c1fd06aab8084add7b5f72
parentf71a9580e229a6e04c89cf901c98aead5b6dd3cd (diff)
Mark Quit functions as _X_NORETURN, as suggested by -Wmissing-noreturn
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--configure.ac2
-rw-r--r--xclipboard.c2
-rw-r--r--xcutsel.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 65d2265..5a3d1a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,7 +42,7 @@ PKG_CHECK_EXISTS([xkbfile], [XKBPKG="xkbfile"], [XKBPKG=""])
if test x$XKBPKG = xxkbfile ; then
AC_DEFINE([XKB], [1], [Define to use libxkbfile calls like XKBStdBell()])
fi
-PKG_CHECK_MODULES(XCLIPBOARD, [xaw7 xmu xt >= 1.1 x11 ${XKBPKG}])
+PKG_CHECK_MODULES(XCLIPBOARD, [xaw7 xmu xt >= 1.1 x11 ${XKBPKG} xproto >= 7.0.17])
PKG_CHECK_MODULES(APPDEFS, xt)
xt_appdefaultdir=`$PKG_CONFIG --variable=appdefaultdir xt`
diff --git a/xclipboard.c b/xclipboard.c
index 62a214c..62259c7 100644
--- a/xclipboard.c
+++ b/xclipboard.c
@@ -246,7 +246,7 @@ DeleteCurrentClip(Widget w, XEvent *ev, String *parms, Cardinal *np)
}
/* ARGSUSED */
-static void
+static void _X_NORETURN
Quit(Widget w, XEvent *ev, String *parms, Cardinal *np)
{
XtCloseDisplay (XtDisplay (text));
diff --git a/xcutsel.c b/xcutsel.c
index 3386b57..5e830e1 100644
--- a/xcutsel.c
+++ b/xcutsel.c
@@ -221,7 +221,7 @@ LoseSelection(Widget w, Atom *selection)
/* ARGSUSED */
-static void
+static void _X_NORETURN
Quit(Widget w, XtPointer closure, XtPointer callData)
{
XtCloseDisplay( XtDisplay(w) );