diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-07-15 18:07:57 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-07-18 17:13:30 -0700 |
| commit | 9c55efa1b36173aa7d768a55990ed7fe2c4f6034 (patch) | |
| tree | 8a19dc65adda9c9b5acb2f7a091364afeedb0f75 | |
| parent | 8093ecf2ecd112914b9399bab0c413369c9057ca (diff) | |
Mark error() & usage() functions as _X_NORETURN
Requires xproto >= 7.0.17
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | 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) @@ -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 |