From: Xinchen Hui <laruence@gmail.com>
Date: Fri, 6 Feb 2015 13:13:16 +0000 (+0800)
Subject: Further fix for bug #68987
X-Git-Tag: PRE_PHP7_REMOVALS~12^2~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3b3308a70a579263bee08db05d96d3a2ad403179;p=php

Further fix for bug #68987
---

diff --git a/Zend/zend.c b/Zend/zend.c
index a35786b7d4..87d2ea38a4 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -957,7 +957,7 @@ ZEND_API zval *zend_get_configuration_directive(zend_string *name) /* {{{ */
 		} \
 	} while (0)
 
-#if !defined(ZEND_WIN32) && !defined(DARWIN)
+#if !defined(HAVE_NORETURN) || defined(HAVE_NORETURN_ALIAS)
 ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */
 #else
 static void zend_error_va_list(int type, const char *format, va_list args)
@@ -965,7 +965,7 @@ static void zend_error_va_list(int type, const char *format, va_list args)
 {
 	char *str;
 	int len;
-#if !defined(ZEND_WIN32) && !defined(DARWIN)
+#if !defined(HAVE_NORETURN) || defined(HAVE_NORETURN_ALIAS)
 	va_list args;
 #endif
 	va_list usr_copy;
@@ -1069,7 +1069,7 @@ static void zend_error_va_list(int type, const char *format, va_list args)
 	}
 #endif /* HAVE_DTRACE */
 
-#if !defined(ZEND_WIN32) && !defined(DARWIN)
+#if !defined(HAVE_NORETURN) || defined(HAVE_NORETURN_ALIAS)
 	va_start(args, format);
 #endif
 
@@ -1182,7 +1182,7 @@ static void zend_error_va_list(int type, const char *format, va_list args)
 			break;
 	}
 
-#if !defined(ZEND_WIN32) && !defined(DARWIN)
+#if !defined(HAVE_NORETURN) || defined(HAVE_NORETURN_ALIAS)
 	va_end(args);
 #endif