com php-src: Fix the build: Zend/zend_inheritance.c
| From: | Kalle Sommer Nielsen | Date: | Wed, 06 Apr 2016 20:25:05 +0000 |
| Subject: | com php-src: Fix the build: Zend/zend_inheritance.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-91639@lists.php.net to get a copy of this message | ||
Commit: fdff901cadef612fe64f0e0cc2eae38ce06008e7
Author: Kalle Sommer Nielsen <kalle@php.net> Wed, 6 Apr 2016 22:25:05 +0200
Parents: 31abb8ab50b24483327e5c828d4e7bbe83501576
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fdff901cadef612fe64f0e0cc2eae38ce06008e7
Log:
Fix the build
Changed paths:
M Zend/zend_inheritance.c
Diff:
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c
index c4dbc87..542ed51 100644
--- a/Zend/zend_inheritance.c
+++ b/Zend/zend_inheritance.c
@@ -577,6 +577,8 @@ static void do_inheritance_check_on_method(zend_function *child, zend_function *
if (UNEXPECTED(!zend_do_perform_implementation_check(child, parent))) {
int error_level;
const char *error_verb;
+ zend_string *method_prototype = zend_get_function_declaration(parent);
+ zend_string *child_prototype = zend_get_function_declaration(child);
if (child->common.prototype && (
child->common.prototype->common.fn_flags & ZEND_ACC_ABSTRACT
@@ -592,8 +594,7 @@ static void do_inheritance_check_on_method(zend_function *child, zend_function *
error_level = E_WARNING;
error_verb = "should";
}
- zend_string *method_prototype = zend_get_function_declaration(parent);
- zend_string *child_prototype = zend_get_function_declaration(child);
+
zend_error(error_level, "Declaration of %s %s be compatible with %s",
ZSTR_VAL(child_prototype), error_verb, ZSTR_VAL(method_prototype));
zend_string_free(child_prototype);
zend_string_free(method_prototype);