com php-src: Fixed issue #1041 (Fix build in OSX with --enable-dtrace): Zend/zend.c
| From: | Xinchen Hui | Date: | Sat, 07 Feb 2015 03:27:42 +0000 |
| Subject: | com php-src: Fixed issue #1041 (Fix build in OSX with --enable-dtrace): Zend/zend.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-84691@lists.php.net to get a copy of this message | ||
Commit: 594c220dea0a1f3bd5e5d7fa72f8e5d00d0d2e6a
Author: Xinchen Hui <laruence@gmail.com> Sat, 7 Feb 2015 11:27:42 +0800
Parents: 47af2381ebc487949f30888c6673b40511d1b2b3
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=594c220dea0a1f3bd5e5d7fa72f8e5d00d0d2e6a
Log:
Fixed issue #1041 (Fix build in OSX with --enable-dtrace)
Bugs:
https://bugs.php.net/1041
Changed paths:
M Zend/zend.c
Diff:
diff --git a/Zend/zend.c b/Zend/zend.c
index 87d2ea3..1bd70ab 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -1059,13 +1059,17 @@ static void zend_error_va_list(int type, const char *format, va_list args)
}
#ifdef HAVE_DTRACE
- if(DTRACE_ERROR_ENABLED()) {
+ if (DTRACE_ERROR_ENABLED()) {
char *dtrace_error_buffer;
+#if !defined(HAVE_NORETURN) || defined(HAVE_NORETURN_ALIAS)
va_start(args, format);
+#endif
zend_vspprintf(&dtrace_error_buffer, 0, format, args);
DTRACE_ERROR(dtrace_error_buffer, (char *)error_filename, error_lineno);
efree(dtrace_error_buffer);
+#if !defined(HAVE_NORETURN) || defined(HAVE_NORETURN_ALIAS)
va_end(args);
+#endif
}
#endif /* HAVE_DTRACE */