From: Xinchen Hui Date: Sun, 11 Mar 2012 15:31:19 +0000 (+0000) Subject: Typo when merging from trunk X-Git-Tag: PHP-5.4.1-RC1~26^2~13 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eac33b454c2b3762a2f8f5fa679170adbab62c59;p=php Typo when merging from trunk --- diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 9295a3a307..47a37d8b9a 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -877,7 +877,7 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache TS 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);