From ca17a562e6a0b91d015d02175827406933955c75 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon, 16 Apr 2012 15:22:33 -0700
Subject: Mark usage() & Fail() as _X_NORETURN to silence gcc warnings
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fstobdf.c: In function ‘usage’:
fstobdf.c:51:1: warning: function might be possible candidate for attribute ‘noreturn’
fstobdf.c: In function ‘Fail’:
fstobdf.c:59:1: warning: function might be possible candidate for attribute ‘noreturn’

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
---
 configure.ac | 2 +-
 fstobdf.c    | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index a937b33..9a11d73 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(FSTOBDF, x11 libfs)
+PKG_CHECK_MODULES(FSTOBDF, [xproto >= 7.0.17 x11 libfs])
 
 AC_CONFIG_FILES([
 	Makefile
diff --git a/fstobdf.c b/fstobdf.c
index 3743a57..8d029a5 100644
--- a/fstobdf.c
+++ b/fstobdf.c
@@ -47,7 +47,9 @@ in this Software without prior written authorization from The Open Group.
 #include	<stdlib.h>
 #include        <string.h>
 #include	"fstobdf.h"
-static void
+
+
+static void _X_NORETURN
 usage(char *progName)
 {
     fprintf(stderr, "Usage: %s [-s <font server>] -fn <font name>\n",
@@ -55,7 +57,7 @@ usage(char *progName)
     exit(0);
 }
 
-static void
+static void _X_NORETURN
 Fail(char *progName)
 {
     fprintf(stderr, "%s: unable to dump font\n", progName);
-- 
cgit v1.2.3