diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-06-07 23:59:41 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-06-08 17:28:45 -0700 |
| commit | 83a7600ae9dbe8b2ca0f9199222245792fb8c0d6 (patch) | |
| tree | 8dadf1b23b517722929080023d9b5170170432f6 | |
| parent | 7abead5688c1958822e3084a5c9854eb52ac58ec (diff) | |
Replace local checks for gcc with _X_NORETURN from xproto 7.0.17
Also declare icoFatal as static since it's only used in this one file.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | ico.c | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 7a23166..284214a 100644 --- a/configure.ac +++ b/configure.ac @@ -36,7 +36,7 @@ XORG_DEFAULT_OPTIONS AC_CONFIG_HEADERS([config.h]) # Checks for pkg-config packages -PKG_CHECK_MODULES(ICO, x11 >= 0.99.1) +PKG_CHECK_MODULES(ICO, [x11 >= 0.99.1 xproto >= 7.0.17]) XTHREADLIB=`$PKG_CONFIG --variable=xthreadlib x11` AC_SUBST(XTHREADLIB) @@ -254,11 +254,10 @@ static xcondition_rec count_cond;/* Xthreads doesn't define an equivalent to * Error handling *****************************************************************************/ -#if defined(__GNUC__) && \ - ((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 7))) -void icoFatal (const char *fmt, const char *a0) __attribute__((__noreturn__)); -#endif -void + +static void icoFatal (const char *fmt, const char *a0) _X_NORETURN; + +static void icoFatal(const char *fmt, const char *a0) { fprintf(stderr, "%s: ", ProgramName); |