summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2013-01-20 23:22:29 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2013-01-20 23:22:29 -0800
commit47479aabdb82907929d76ac87ca71f44819791f8 (patch)
tree42ec9b3060fb7e4efe017b0b9e893bdac2bdacf7
parent5340bddccdd21fd34aae996ac3347ddb71f00de6 (diff)
Mark usage & AbortTest as _X_NORETURN
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--configure.ac2
-rw-r--r--x11perf.c2
-rw-r--r--x11perf.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index a928630..c3b197b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,7 +48,7 @@ AC_SUBST([x11perfcompdir], [$libdir/X11/x11perfcomp])
AC_PATH_PROG(MKTEMP, mktemp)
# Checks for pkg-config packages
-PKG_CHECK_MODULES(X11PERF, x11 xmuu)
+PKG_CHECK_MODULES(X11PERF, [x11 xmuu xproto >= 7.0.17])
# Check for Xrender library
PKG_CHECK_MODULES(XRENDER, xrender, [xrender_found=yes], [xrender_found=no])
diff --git a/x11perf.c b/x11perf.c
index 8825b71..8799f34 100644
--- a/x11perf.c
+++ b/x11perf.c
@@ -316,7 +316,7 @@ ReportTimes(double usecs, long long n, char *str, int average)
************************************************/
static char *program_name;
-static void usage(void);
+static void usage(void) _X_NORETURN;
/*
* Get_Display_Name (argc, argv) Look for -display, -d, or host:dpy (obselete)
diff --git a/x11perf.h b/x11perf.h
index 60b19bf..3d9c8ad 100644
--- a/x11perf.h
+++ b/x11perf.h
@@ -135,7 +135,7 @@ extern Test test[];
extern int abortTest;
-extern void AbortTest (void);
+extern void AbortTest (void) _X_NORETURN;
#define CheckAbort() if (abortTest) AbortTest ()
#define ForEachTest(x) for (x = 0; test[x].option != NULL; x++)