summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2013-01-12 19:36:43 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2013-01-12 19:36:43 -0800
commit4c516e1b0ad66586e3f770d988de775481482e1a (patch)
treed80c5715c1101c80c647ba3f53d50cb8e703892e
parentb33ad85fe9190d2ddbddb3422cc06a5a36c0cde6 (diff)
Mark uFatalError as _X_NORETURN
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--configure.ac6
-rw-r--r--utils.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 8570559..a6d3758 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,13 +40,13 @@ XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
# xkbvleds checks
-PKG_CHECK_MODULES(XKBVLEDS, xproto xaw7 xt x11)
+PKG_CHECK_MODULES(XKBVLEDS, [xproto >= 7.0.17 xaw7 xt x11])
# xkbbell checks
-PKG_CHECK_MODULES(XKBBELL, xproto inputproto x11)
+PKG_CHECK_MODULES(XKBBELL, [xproto inputproto x11])
# xkbwatch checks
-PKG_CHECK_MODULES(XKBWATCH, xproto xaw7 xt x11)
+PKG_CHECK_MODULES(XKBWATCH, [xproto >= 7.0.17 xaw7 xt x11])
AC_CONFIG_FILES([
Makefile
diff --git a/utils.h b/utils.h
index 085c8cb..73ad5eb 100644
--- a/utils.h
+++ b/utils.h
@@ -107,7 +107,7 @@ extern void uInformation(const char *s, ...) _X_ATTRIBUTE_PRINTF(1,2);
extern void uAction(const char *s, ...) _X_ATTRIBUTE_PRINTF(1,2);
extern void uWarning(const char *s, ...) _X_ATTRIBUTE_PRINTF(1,2);
extern void uError(const char *s, ...) _X_ATTRIBUTE_PRINTF(1,2);
-extern void uFatalError(const char *s, ...) _X_ATTRIBUTE_PRINTF(1,2);
+extern void uFatalError(const char *s, ...) _X_ATTRIBUTE_PRINTF(1,2) _X_NORETURN;
extern void uInternalError(const char *s, ...) _X_ATTRIBUTE_PRINTF(1,2);
/***====================================================================***/