com php-src: Fix for Clang: Zend/zend.c
| From: | Dmitry Stogov | Date: | Thu, 18 Sep 2014 20:38:34 +0000 |
| Subject: | com php-src: Fix for Clang: Zend/zend.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81742@lists.php.net to get a copy of this message | ||
Commit: 21514b0d9a9479430d5f70b6f1c27a703138f113
Author: Dmitry Stogov <dmitry@zend.com> Fri, 19 Sep 2014 00:38:34 +0400
Parents: b0064fc27f6b4aab6cf365c84985d225eeff7b24
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=21514b0d9a9479430d5f70b6f1c27a703138f113
Log:
Fix for Clang
Changed paths:
M Zend/zend.c
Diff:
diff --git a/Zend/zend.c b/Zend/zend.c
index 07171bd..78b18db 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, ...) /* {{{ */