summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2013-02-22 23:01:53 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2013-02-22 23:01:53 -0800
commit2e195507f5b17425d02af4dd6a4f151158d715c3 (patch)
tree2e694e29b1c88f0beac6830e147d2361b2fc7e37
parent07f1204a7d56e6b02098cf4b82f9f90576e7f289 (diff)
Mark Exit() and usage() as _X_NORETURN
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--configure.ac2
-rw-r--r--xkill.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 9bffa65..6b4bb5c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,7 +39,7 @@ XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XKILL, x11 xmuu)
+PKG_CHECK_MODULES(XKILL, [x11 xmuu xproto >= 7.0.17])
AC_CONFIG_FILES([
Makefile
diff --git a/xkill.c b/xkill.c
index 429a64a..8ee3431 100644
--- a/xkill.c
+++ b/xkill.c
@@ -60,7 +60,7 @@ static int verify_okay_to_kill ( Display *dpy, int screenno );
static Bool wm_state_set ( Display *dpy, Window win );
static Bool wm_running ( Display *dpy, int screenno );
-static void
+static void _X_NORETURN
Exit(int code, Display *dpy)
{
if (dpy) {
@@ -69,7 +69,7 @@ Exit(int code, Display *dpy)
exit (code);
}
-static void
+static void _X_NORETURN
usage(void)
{
const char *options =