From b233c195792ce3af40166bb927471fa130a94627 Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Wed, 23 May 2012 13:43:49 +0800 Subject: Fix typo while resolving conflicts --- ext/reflection/php_reflection.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; } -- cgit v1.2.1