diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-01-29 11:03:40 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-01-29 11:03:45 -0800 |
| commit | a02099a6869064c8b8c04a91acf5ece8568c7389 (patch) | |
| tree | 368575b1a8cac1750c39f96c97324661e8204072 | |
| parent | 303aa90258f0ceff98e389b226860f0d0afe4c12 (diff) | |
Replace gcc noreturn & printf attributes with macros from <X11/Xfuncproto.h>
Adds dependency on x11proto 7.0.17 to get the definition of _X_NORETURN
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | x2jet.c | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 5205339..d133052 100644 --- a/configure.ac +++ b/configure.ac @@ -39,7 +39,7 @@ XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS # Checks for pkg-config packages -PKG_CHECK_MODULES(XPR, xmuu x11) +PKG_CHECK_MODULES(XPR, [xmuu x11 xproto >= 7.0.17]) AC_CONFIG_FILES([Makefile]) AC_OUTPUT @@ -72,6 +72,7 @@ from the X Consortium. #include <stdarg.h> #include <X11/Xlib.h> #include <X11/XWDFile.h> +#include <X11/Xfuncproto.h> #include "xpr.h" @@ -260,10 +261,7 @@ static void write_image ( enum orientation orient, enum device device); static void fatal_err (const char *s, ...) -#if defined(__GNUC__) && (__GNUC__ > 2) -__attribute__((noreturn, format(printf, 1, 2))) -#endif - ; + _X_NORETURN _X_ATTRIBUTE_PRINTF(1,2); /* Computes the centipoint width of one printer dot. */ |