Replace local checks for gcc with _X_NORETURN from xproto 7.0.17

Change-Id: I91bf98b7d78aa4130198848d745142018b0ca435
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

diff --git a/configure.ac b/configure.ac
index 1945711..d24848c 100644 (file)
--- 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

diff --git a/xev.c b/xev.c
index 23abe74..a54b794 100644 (file)
--- a/xev.c
+++ b/xev.c
@@ -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)
 {