Patch bug68987.patch for Compile Failure Bug #68987

Patch version 2015-02-06 09:41 UTC

• 2015-02-06 09:41 UTC [diff to current]

Developer: laruence@php.net

diff --git a/Zend/zend.c b/Zend/zend.c
index d28d8ef..d4ae1c6 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -1199,7 +1199,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__))
+#ifdef HAVE_NORETURN
 void zend_error_noreturn(int type, const char *format, ...) __attribute__ ((alias("zend_error"),noreturn));
 #elif defined(ZEND_WIN32) || defined(DARWIN)
 ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */
@@ -1211,6 +1211,7 @@ ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */
 	va_end(va);
 }
 
+#if !defined(DARWIN)
 ZEND_API ZEND_NORETURN void zend_error_noreturn(int type, const char *format, ...)
 {
 	va_list va;
@@ -1219,6 +1220,7 @@ ZEND_API ZEND_NORETURN void zend_error_noreturn(int type, const char *format, ..
 	zend_error_va_list(type, format, va);
 	va_end(va);
 }
+#endif
 /* }}} */
 #endif
 
diff --git a/Zend/zend_portability.h b/Zend/zend_portability.h
index dfc3ad1..d33026c 100644
--- a/Zend/zend_portability.h
+++ b/Zend/zend_portability.h
@@ -214,7 +214,7 @@ char *alloca();
 #endif
 #define restrict __restrict__
 
-#if (defined(__GNUC__) && __GNUC__ >= 3 && !defined(__INTEL_COMPILER) && !defined(DARWIN) && !defined(__hpux) && !defined(_AIX) && !defined(__osf__)) || __has_attribute(noreturn)
+#if (defined(__GNUC__) && __GNUC__ >= 3 && !defined(__INTEL_COMPILER) && !defined(DARWIN) && !defined(__hpux) && !defined(_AIX) && !defined(__osf__))
 # define HAVE_NORETURN
 # define ZEND_NORETURN __attribute__((noreturn))
 #elif defined(ZEND_WIN32)