[PATCH:xset 2/3] Mark error() & usage() functions as _X_NORETURN

Alan Coopersmith alan.coopersmith at oracle.com
Fri Jul 15 18:34:20 PDT 2011


Requires xproto >= 7.0.17

Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
---
 configure.ac |    2 +-
 xset.c       |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index e6679d7..ddc7caf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,7 +41,7 @@ XORG_DEFAULT_OPTIONS
 AC_CHECK_FUNCS([usleep])
 
 # Checks for pkg-config packages
-PKG_CHECK_MODULES(XSET, xmuu)
+PKG_CHECK_MODULES(XSET, [xproto >= 7.0.17 xmuu])
 
 # This is used below to allow <X11/Xlib.h> to be found
 PKG_CHECK_MODULES(SET_X11, x11)
diff --git a/xset.c b/xset.c
index 7703618..cca592d 100644
--- a/xset.c
+++ b/xset.c
@@ -151,8 +151,8 @@ static void set_lock(Display *dpy, Bool onoff);
 static char *on_or_off(int val, int onval, char *onstr,
 		       int offval, char *offstr, char buf[]);
 static void query(Display *dpy);
-static void usage(char *fmt, ...);
-static void error(char *message);
+static void usage(char *fmt, ...) _X_NORETURN;
+static void error(char *message) _X_NORETURN;
 static int local_xerror(Display *dpy, XErrorEvent *rep);
 
 #ifdef XF86MISC
-- 
1.7.3.2



More information about the xorg-devel mailing list