summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@apple.com>2011-11-11 11:07:30 -0800
committerJeremy Huddleston <jeremyhu@apple.com>2011-11-11 11:10:00 -0800
commitb9f6482d5fc413222334c2370ef8b9693f4b50fd (patch)
tree626f690af74c43408c5605ce30be431251fde18c
parent8ea06128c70b07c265a217222f2a245aad4bfce4 (diff)
downloadxorg-app-xkbcomp-b9f6482d5fc413222334c2370ef8b9693f4b50fd.tar.gz
Add missing _X_NORETURN to uFatalError
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
-rw-r--r--configure.ac2
-rw-r--r--utils.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 9c400b6..383ccf0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,7 +45,7 @@ fi
AC_CHECK_FUNCS([strdup strcasecmp])
-REQUIRED_MODULES="x11 xkbfile"
+REQUIRED_MODULES="x11 xkbfile xproto >= 7.0.17"
# Checks for pkg-config packages
PKG_CHECK_MODULES(XKBCOMP, [$REQUIRED_MODULES])
diff --git a/utils.h b/utils.h
index 3bc61cb..63eda36 100644
--- a/utils.h
+++ b/utils.h
@@ -159,7 +159,7 @@ uInformation(const char * /* s */ , ...
#define FATAL uFatalError
extern void uFatalError(const char * /* s */ , ...
- ) _X_ATTRIBUTE_PRINTF(1, 2);
+ ) _X_ATTRIBUTE_PRINTF(1, 2) _X_NORETURN;
/* WSGO stands for "Weird Stuff Going On" */
#define WSGO6 uInternalError