diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2010-06-06 16:57:22 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2010-06-13 13:08:51 -0700 |
| commit | 369c37a62cdd2841a3e8778674029841231f45ad (patch) | |
| tree | a41cd0263425d5a918bc69b86c051e28a74f494a | |
| parent | c72551c9e8805d44ee76f6723cada6843657031b (diff) | |
Use _X_NORETURN from xproto 7.0.17
Also throw in _X_ATTRIBUTE_PRINTF while we're here.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | dsimple.h | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index a61b31b..7ef640a 100644 --- a/configure.ac +++ b/configure.ac @@ -41,7 +41,7 @@ XORG_DEFAULT_OPTIONS AC_CHECK_FUNCS([strlcat]) # Checks for pkg-config packages -PKG_CHECK_MODULES(XWININFO, xext x11) +PKG_CHECK_MODULES(XWININFO, xext x11 [xproto >= 7.0.17]) AC_SUBST(XWININFO_CFLAGS) AC_SUBST(XWININFO_LIBS) @@ -37,6 +37,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)) @@ -76,8 +78,4 @@ void usage(void); Window Select_Window(Display *, int); Window Window_With_Name(Display *, Window, char *); -#ifdef __GNUC__ -void Fatal_Error(char *, ...) __attribute__((__noreturn__)); -#else -void Fatal_Error(char *, ...); -#endif +void Fatal_Error(char *, ...) _X_NORETURN _X_ATTRIBUTE_PRINTF(1, 2); |