Commit:    b233c195792ce3af40166bb927471fa130a94627
Author:    Xinchen Hui <larue...@php.net>         Wed, 23 May 2012 13:43:49 
+0800
Committer: Stanislav Malyshev <s...@php.net>      Wed, 23 May 2012 18:45:21 
-0500
Parents:   0eb02b874de8c97b6ee4c4226a95971e1d4d27ff
Branches:  PHP-5.4.4

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=b233c195792ce3af40166bb927471fa130a94627

Log:
Fix typo while resolving conflicts

Changed paths:
  M  ext/reflection/php_reflection.c


Diff:
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index fe50289..ccd587d 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;
        }


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to