summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2013-01-20 22:45:53 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2013-01-20 23:03:29 -0800
commit87fd28cd5a5acfe6e91c97c4af0a469e1e86cbd5 (patch)
tree4b9ad10eb94699f3b5a1718004399ddbf2fe1820
parent637c59e78f699a824e78316cb8ca3113bb5c738b (diff)
Mark fatalerr & catch as _X_NORETURN
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--configure.ac2
-rw-r--r--def.h2
-rw-r--r--main.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index d0bdbde..0b352d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,6 +30,6 @@ dnl Use 64-bit file operations on 32-bit systems that support them
AC_SYS_LARGEFILE
dnl Check for pkg-config packages
-PKG_CHECK_MODULES(X, [xproto])
+PKG_CHECK_MODULES(X, [xproto >= 7.0.17])
AC_OUTPUT([Makefile])
diff --git a/def.h b/def.h
index 0d49c55..1930cde 100644
--- a/def.h
+++ b/def.h
@@ -172,7 +172,7 @@ int cppsetup(const char *filename,
struct inclist *inc);
-extern void fatalerr(const char *, ...) _X_ATTRIBUTE_PRINTF(1, 2);
+extern void fatalerr(const char *, ...) _X_ATTRIBUTE_PRINTF(1, 2) _X_NORETURN;
extern void warning(const char *, ...) _X_ATTRIBUTE_PRINTF(1, 2);
extern void warning1(const char *, ...) _X_ATTRIBUTE_PRINTF(1, 2);
diff --git a/main.c b/main.c
index 8691395..f68a361 100644
--- a/main.c
+++ b/main.c
@@ -113,7 +113,7 @@ boolean warn_multiple = FALSE;
static void setfile_cmdinc(struct filepointer *filep, long count, char **list);
static void redirect(const char *line, const char *makefile);
-static RETSIGTYPE
+static RETSIGTYPE _X_NORETURN
catch (int sig)
{
fflush (stdout);