From: Xinchen Hui <laruence@php.net>
Date: Sun, 9 Jun 2013 06:24:05 +0000 (+0800)
Subject: Fixed merge wrongly
X-Git-Tag: php-5.4.17RC1~23^2~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e14800dd46ce9adbaa696fec6b2f1741bbc3abba;p=php

Fixed merge wrongly
---

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);