com php-src: Fixed merge wrongly: Zend/zend_vm_def.h Ze nd/zend_vm_execute.h
| From: | Xinchen Hui | Date: | Sun, 09 Jun 2013 06:24:05 +0000 |
| Subject: | com php-src: Fixed merge wrongly: Zend/zend_vm_def.h Ze nd/zend_vm_execute.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-72333@lists.php.net to get a copy of this message | ||
Commit: e14800dd46ce9adbaa696fec6b2f1741bbc3abba
Author: Xinchen Hui <laruence@php.net> Sun, 9 Jun 2013 14:24:05 +0800
Parents: 3cc891bf3a27eb13a101da3391b75cfa77a117ae
Branches: PHP-5.4
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e14800dd46ce9adbaa696fec6b2f1741bbc3abba
Log:
Fixed merge wrongly
Changed paths:
M Zend/zend_vm_def.h
M Zend/zend_vm_execute.h
Diff:
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 40e2e42..15cef71 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 ad6d708..4982cc2 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);