From 862292d9509856cfd311f9741db059b92a5fd78a Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Fri, 28 Jan 2011 20:06:16 -0800 Subject: Use _X_NORETURN from xproto 7.0.17 instead of local check Signed-off-by: Alan Coopersmith Reviewed-by: Julien Cristau --- configure.ac | 5 +---- dsimple.h | 8 +++----- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index 5c6b2e6..ac15324 100644 --- a/configure.ac +++ b/configure.ac @@ -34,11 +34,8 @@ XORG_DEFAULT_OPTIONS AC_CONFIG_HEADERS([config.h]) - - # Checks for pkg-config packages -PKG_CHECK_MODULES(XLSFONTS, x11) - +PKG_CHECK_MODULES(XLSFONTS, [x11 xproto >= 7.0.17]) AC_CONFIG_FILES([ Makefile diff --git a/dsimple.h b/dsimple.h index 6af16fd..c01f85d 100644 --- a/dsimple.h +++ b/dsimple.h @@ -39,6 +39,8 @@ from The Open Group. * Send bugs, etc. to chariot@athena.mit.edu. */ +#include + /* Simple helper macros */ #ifndef MAX #define MAX(a,b) (((a)>(b))?(a):(b)) @@ -65,8 +67,4 @@ void usage(void); #define X_USAGE "[host:display]" /* X arguments handled by Get_Display_Name */ -#ifdef __GNUC__ -void Fatal_Error(char *, ...) __attribute__((__noreturn__)); -#else -void Fatal_Error(char *, ...); -#endif +void Fatal_Error(char *, ...) _X_NORETURN; -- cgit v1.2.3