clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 19:07:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Further fix for bug #68987

Browse Source
This commit is contained in:
Xinchen Hui 2015-02-06 21:13:16 +08:00
parent 32bd6683d3
commit 3b3308a70a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Zend/zend.c
View File

@ -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