From: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue, 22 Jan 2013 07:02:57 +0000 (-0800)
Subject: Mark usage() as _X_NORETURN
X-Git-Tag: xdpyinfo-1.3.1~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ee596f7f67b203d04974fce16deadfcd122d0441;p=platform%2Fupstream%2Fxdpyinfo.git

Mark usage() as _X_NORETURN

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

diff --git a/configure.ac b/configure.ac
index 9329a78..71f1643 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,7 +36,7 @@ XORG_DEFAULT_OPTIONS
 AC_CONFIG_HEADERS([config.h])
 
 # Checks for pkg-config packages
-PKG_CHECK_MODULES(XDPYINFO, xext x11 xtst x11-xcb xcb)
+PKG_CHECK_MODULES(XDPYINFO, [xext x11 xtst x11-xcb xcb xproto >= 7.0.17])
 
 # This is used below to allow <X11/Xlib.h> to be found
 PKG_CHECK_MODULES(DPY_X11, x11)
diff --git a/xdpyinfo.c b/xdpyinfo.c
index 2482156..fdf2515 100644
--- a/xdpyinfo.c
+++ b/xdpyinfo.c
@@ -1436,7 +1436,7 @@ print_marked_extensions(Display *dpy)
     }
 }
 
-static void
+static void _X_NORETURN
 usage(void)
 {
     fprintf (stderr, "usage:  %s [options]\n", ProgramName);