summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2013-01-21 23:02:57 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2013-01-21 23:02:57 -0800
commitee596f7f67b203d04974fce16deadfcd122d0441 (patch)
tree41e41e112964e1296a1887b64ad7ddc3cbe64c53
parent5509502647a997959ec056fec23d471b73eddb5f (diff)
Mark usage() as _X_NORETURN
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--configure.ac2
-rw-r--r--xdpyinfo.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 9329a78..71f1643 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,7 +36,7 @@ XORG_DEFAULT_OPTIONS
AC_CONFIG_HEADERS([config.h])
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XDPYINFO, xext x11 xtst x11-xcb xcb)
+PKG_CHECK_MODULES(XDPYINFO, [xext x11 xtst x11-xcb xcb xproto >= 7.0.17])
# This is used below to allow <X11/Xlib.h> to be found
PKG_CHECK_MODULES(DPY_X11, x11)
diff --git a/xdpyinfo.c b/xdpyinfo.c
index 2482156..fdf2515 100644
--- a/xdpyinfo.c
+++ b/xdpyinfo.c
@@ -1436,7 +1436,7 @@ print_marked_extensions(Display *dpy)
}
}
-static void
+static void _X_NORETURN
usage(void)
{
fprintf (stderr, "usage: %s [options]\n", ProgramName);