com php-src: Further fix for bug #68987: Zend/zend.c

From: Date: Fri, 06 Feb 2015 13:13:16 +0000
Subject: com php-src: Further fix for bug #68987: Zend/zend.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-84682@lists.php.net to get a copy of this message
Commit: 3b3308a70a579263bee08db05d96d3a2ad403179 Author: Xinchen Hui <laruence@gmail.com> Fri, 6 Feb 2015 21:13:16 +0800 Parents: 32bd6683d303aa07e5068fb72cf5781e2ba1e722 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3b3308a70a579263bee08db05d96d3a2ad403179 Log: Further fix for bug #68987 Bugs: https://bugs.php.net/68987 Changed paths: M Zend/zend.c Diff: diff --git a/Zend/zend.c b/Zend/zend.c index a35786b..87d2ea3 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

« previous php.cvs (#84682) next »