svn: /php/php-src/branches/PHP_5_3/Zend/ zend_execute_API.c
| From: | Xinchen Hui | Date: | Sun, 11 Mar 2012 15:31:19 +0000 |
| Subject: | svn: /php/php-src/branches/PHP_5_3/Zend/ zend_execute_API.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-67902@lists.php.net to get a copy of this message | ||
laruence Sun, 11 Mar 2012 15:31:19 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=324109
Log:
Typo when merging from trunk
Changed paths:
U php/php-src/branches/PHP_5_3/Zend/zend_execute_API.c
Modified: php/php-src/branches/PHP_5_3/Zend/zend_execute_API.c
===================================================================
--- php/php-src/branches/PHP_5_3/Zend/zend_execute_API.c 2012-03-11 15:28:31 UTC (rev 324108)
+++ php/php-src/branches/PHP_5_3/Zend/zend_execute_API.c 2012-03-11 15:31:19 UTC (rev 324109)
@@ -877,7 +877,7 @@
if (fci->no_separation &&
!ARG_MAY_BE_SENT_BY_REF(EX(function_state).function, i + 1)) {
- if (i || UNEXPECTED(UNEXPECTED(ZEND_VM_STACK_ELEMETS(EG(argument_stack)) ==
EG(argument_stack)->top))) {
+ if (i || UNEXPECTED(ZEND_VM_STACK_ELEMETS(EG(argument_stack)) == EG(argument_stack)->top))
{
/* hack to clean up the stack */
zend_vm_stack_push_nocheck((void *) (zend_uintptr_t)i TSRMLS_CC);
zend_vm_stack_clear_multiple(TSRMLS_C);