summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@apple.com>2012-05-19 04:34:32 -0700
committerJeremy Huddleston <jeremyhu@apple.com>2012-05-19 04:34:32 -0700
commit8156aad786754499f4636104aa5bd8a27a281448 (patch)
tree9f889790812e615b7a187bfcdd8216cabaedd615
parent641588afe92c803a1231ecf6281115f55b20e62a (diff)
Annotate Fatal and Fatalx as _X_NORETURN
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
-rw-r--r--configure.ac2
-rw-r--r--xinit.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index d18c4b0..db65b4c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -141,7 +141,7 @@ AM_CONDITIONAL(TIGER_LAUNCHD, [test "x$TIGER_LAUNCHD" = "xyes"])
AM_CONDITIONAL(LAUNCHAGENT_XSERVER, [test "x$launchagentxserver" != "xno"])
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XINIT, x11)
+PKG_CHECK_MODULES(XINIT, x11 xproto >= 7.0.17)
case $host_os in
*bsd*)
diff --git a/xinit.c b/xinit.c
index 2ab817f..46f717a 100644
--- a/xinit.c
+++ b/xinit.c
@@ -653,6 +653,7 @@ verrorx(const char *fmt, va_list ap)
}
static void
+_X_NORETURN
Fatal(const char *fmt, ...)
{
va_list ap;
@@ -663,6 +664,7 @@ Fatal(const char *fmt, ...)
}
static void
+_X_NORETURN
Fatalx(const char *fmt, ...)
{
va_list ap;