summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2012-05-23 13:43:49 +0800
committerStanislav Malyshev <stas@php.net>2012-05-23 18:45:21 -0500
commitb233c195792ce3af40166bb927471fa130a94627 (patch)
treea6de29ef6d3718fbf94a1fcb191cb3bcec8c79fe
parent0eb02b874de8c97b6ee4c4226a95971e1d4d27ff (diff)
downloadphp-git-b233c195792ce3af40166bb927471fa130a94627.tar.gz
Fix typo while resolving conflicts
-rw-r--r--ext/reflection/php_reflection.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index fe50289e2f..ccd587d709 100644
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -2593,7 +2593,7 @@ ZEND_METHOD(reflection_parameter, getDefaultValue)
return;
}
precv = _get_recv_op((zend_op_array*)param->fptr, param->offset);
- if (!precv || precv->opcode != ZEND_RECV_INIT || precv->op2_type == IS_UNUSED) {
+ if (!precv || precv->opcode != ZEND_RECV_INIT || precv->op2.op_type == IS_UNUSED) {
zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC, "Internal error");
return;
}