[PATCH:xscope] Mark panic() as _X_NORETURN

[Jeremy Huddleston]

Looks about right.

Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>

On Jan 6, 2012, at 19:01, Alan Coopersmith wrote:

> 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 at oracle.com>
> ---
> configure.ac |    6 ++++--
> 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])
> 
> diff --git a/proto.h b/proto.h
> index 3c338c7..d86e55b 100644
> --- a/proto.h
> +++ b/proto.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));
> 
> -- 
> 1.7.3.2
> 
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel
>