diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-06-09 20:19:49 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-06-09 20:19:49 -0700 |
| commit | e13d96502d6df614c35584c2e9919f4a508de34f (patch) | |
| tree | d2cde7c0280bbde4cd6425cc771456be6d9953f6 | |
| parent | 7965bc6efbf5db244593735bbb98f0ffa759cd1a (diff) | |
Replace local checks for gcc with _X_NORETURN from xproto 7.0.17
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | xev.c | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 1945711..d24848c 100644 --- a/configure.ac +++ b/configure.ac @@ -36,7 +36,7 @@ XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS # Checks for pkg-config packages -PKG_CHECK_MODULES(XEV, xrandr >= 1.2 xrender x11) +PKG_CHECK_MODULES(XEV, [xrandr >= 1.2 xrender x11 xproto >= 7.0.17]) AC_CONFIG_FILES([ Makefile @@ -75,6 +75,8 @@ Atom wm_protocols; Bool have_rr; int rr_event_base, rr_error_base; +static void usage (void) _X_NORETURN; + static void prologue (XEvent *eventp, char *event_name) { @@ -863,11 +865,6 @@ set_sizehints (XSizeHints *hintp, int min_width, int min_height, } } - -#if defined(__GNUC__) && \ - ((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 7))) -static void usage (void) __attribute__((__noreturn__)); -#endif static void usage (void) { |