summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2011-06-10 03:19:49 (GMT)
committerSung-Jin Park <sj76.park@samsung.com>2013-09-03 03:32:31 (GMT)
commit567cd8ef2f9c093ac58f746d7241c9151386f0d5 (patch)
treed2cde7c0280bbde4cd6425cc771456be6d9953f6
parentf876d457b59e7d5d8feded8a1399616e498b7908 (diff)
downloadxev-567cd8ef2f9c093ac58f746d7241c9151386f0d5.zip
xev-567cd8ef2f9c093ac58f746d7241c9151386f0d5.tar.gz
xev-567cd8ef2f9c093ac58f746d7241c9151386f0d5.tar.bz2
Replace local checks for gcc with _X_NORETURN from xproto 7.0.17refs/changes/99/9199/1
Change-Id: I91bf98b7d78aa4130198848d745142018b0ca435 Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--configure.ac2
-rw-r--r--xev.c7
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
diff --git a/xev.c b/xev.c
index 23abe74..a54b794 100644
--- 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)
{