diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2012-01-06 00:34:45 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2012-01-15 09:01:28 -0800 |
| commit | a1c283e6f39117301319b60e261e9d1e22ea0d4d (patch) | |
| tree | c131ee137acd0cf80c25fff1be56b96157de8b03 | |
| parent | a66cdfd0978015c2f3eedc968a40637f850aa917 (diff) | |
| download | xscope-a1c283e6f39117301319b60e261e9d1e22ea0d4d.tar.gz | |
Mark panic() as _X_NORETURN
Makes the dependency on x11proto explicit - it was already needed for
the X11 headers included in various files, but now needs to be at least
7.0.17 for the _X_NORETURN definition in Xfuncproto.h
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | proto.h | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index fd444f9..cdf6df6 100644 --- a/configure.ac +++ b/configure.ac @@ -62,11 +62,13 @@ if test "x$XTRANS" = xyes ; then # Transport selection macro from xtrans.m4 XTRANS_CONNECTION_FLAGS - # Checks for pkg-config packages - PKG_CHECK_MODULES(XSCOPE, xtrans) + XTRANS_PKG='xtrans' AC_DEFINE([USE_XTRANS], [1], [Use xtrans for socket connection code]) fi +# Checks for pkg-config packages +PKG_CHECK_MODULES(XSCOPE, [xproto >= 7.0.17 $XTRANS_PKG]) + AC_CHECK_FUNCS([getdtablesize]) AC_CHECK_HEADERS([sys/filio.h]) @@ -1,9 +1,10 @@ #include "x11.h" +#include <X11/Xfuncproto.h> /* common.c */ extern void enterprocedure (const char *s); extern void warn (const char *s); -extern void panic (const char *s); +extern void panic (const char *s) _X_NORETURN; extern void SetSignalHandling (void); extern void SetUpConnectionSocket (int iport, void (*connectionFunc) (int)); |