diff options
| author | Xinchen Hui <laruence@php.net> | 2013-06-09 14:24:05 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2013-06-09 14:24:05 +0800 |
| commit | e14800dd46ce9adbaa696fec6b2f1741bbc3abba (patch) | |
| tree | 6f05eeead398b673d87572d09288d9a9f8bdde3f /Zend | |
| parent | 3cc891bf3a27eb13a101da3391b75cfa77a117ae (diff) | |
| download | php-git-e14800dd46ce9adbaa696fec6b2f1741bbc3abba.tar.gz | |
Fixed merge wrongly
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/zend_vm_def.h | 2 | ||||
| -rw-r--r-- | Zend/zend_vm_execute.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 40e2e42e7d..15cef7132f 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -2685,7 +2685,7 @@ ZEND_VM_HELPER(zend_do_fcall_common_helper, ANY, ANY) zval_ptr_dtor(&ret->var.ptr); } } else if (RETURN_VALUE_USED(opline)) { - EX_T(opline->result.u.var).var.ptr = NULL; + EX_T(opline->result.var).var.ptr = NULL; } } else if (fbc->type == ZEND_USER_FUNCTION) { EX(original_return_value) = EG(return_value_ptr_ptr); diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index ad6d708381..4982cc2133 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -649,7 +649,7 @@ static int ZEND_FASTCALL zend_do_fcall_common_helper_SPEC(ZEND_OPCODE_HANDLER_AR zval_ptr_dtor(&ret->var.ptr); } } else if (RETURN_VALUE_USED(opline)) { - EX_T(opline->result.u.var).var.ptr = NULL; + EX_T(opline->result.var).var.ptr = NULL; } } else if (fbc->type == ZEND_USER_FUNCTION) { EX(original_return_value) = EG(return_value_ptr_ptr); |