diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-01-28 20:06:16 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-02-01 19:55:46 -0800 |
| commit | 862292d9509856cfd311f9741db059b92a5fd78a (patch) | |
| tree | ba029ebe045459119dbef4a24ebb52490946c934 | |
| parent | 431c1ed9e1b445e20a9c0413c3faeee566755b4d (diff) | |
Use _X_NORETURN from xproto 7.0.17 instead of local check
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | 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 @@ -39,6 +39,8 @@ from The Open Group. * Send bugs, etc. to chariot@athena.mit.edu. */ +#include <X11/Xfuncproto.h> + /* 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; |