From: Dmitry Stogov Date: Thu, 18 Sep 2014 20:38:34 +0000 (+0400) Subject: Fix for Clang X-Git-Tag: POST_NATIVE_TLS_MERGE^2~215 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=21514b0d9a9479430d5f70b6f1c27a703138f113;p=php Fix for Clang --- diff --git a/Zend/zend.c b/Zend/zend.c index 07171bd4cc..78b18dbbc6 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -1287,7 +1287,7 @@ static void zend_error_va_list(int type, const char *format, va_list args) } /* }}} */ -#if defined(__GNUC__) && __GNUC__ >= 3 && !defined(__INTEL_COMPILER) && !defined(DARWIN) && !defined(__hpux) && !defined(_AIX) && !defined(__osf__) +#if (defined(__GNUC__) && __GNUC__ >= 3 && !defined(__INTEL_COMPILER) && !defined(DARWIN) && !defined(__hpux) && !defined(_AIX) && !defined(__osf__)) || __has_attribute(noreturn) void zend_error_noreturn(int type, const char *format, ...) __attribute__ ((alias("zend_error"),noreturn)); #elif defined(ZEND_WIN32) ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */