Fix typo while resolving conflicts

laruence · smalyshev · commit b233c195792c · 2012-05-23T18:45:21.000-05:00
diff --git 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;
 	}

Original file line number	Diff line number	Diff line change
`@@ -2593,7 +2593,7 @@ ZEND_METHOD(reflection_parameter, getDefaultValue)`
`2593`	`2593`	`return;`
`2594`	`2594`	`}`
`2595`	`2595`	`precv = _get_recv_op((zend_op_array*)param->fptr, param->offset);`
`2596`		`- if (!precv \|\| precv->opcode != ZEND_RECV_INIT \|\| precv->op2_type == IS_UNUSED) {`
	`2596`	`+ if (!precv \|\| precv->opcode != ZEND_RECV_INIT \|\| precv->op2.op_type == IS_UNUSED) {`
`2597`	`2597`	`zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC, "Internal error");`
`2598`	`2598`	`return;`
`2599`	`2599`	`}`