felipe Mon, 13 Jun 2011 17:52:23 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=312126
Log:
- Fix build on Windows
Changed paths:
U php/php-src/branches/PHP_5_3/Zend/zend_compile.c
U php/php-src/branches/PHP_5_4/Zend/zend_compile.c
U php/php-src/trunk/Zend/zend_compile.c
Modified: php/php-src/branches/PHP_5_3/Zend/zend_compile.c
===================================================================
--- php/php-src/branches/PHP_5_3/Zend/zend_compile.c 2011-06-13 17:01:30 UTC
(rev 312125)
+++ php/php-src/branches/PHP_5_3/Zend/zend_compile.c 2011-06-13 17:52:23 UTC
(rev 312126)
@@ -2529,7 +2529,7 @@
}
/* }}} */
-static zend_bool zend_do_perform_implementation_check(const zend_function *fe,
const zend_function *proto) /* {{{ */
+static zend_bool zend_do_perform_implementation_check(const zend_function *fe,
const zend_function *proto TSRMLS_DC) /* {{{ */
{
zend_uint i;
@@ -2578,10 +2578,11 @@
(colon =
zend_memrchr(fe->common.arg_info[i].class_name, '\\',
fe->common.arg_info[i].class_name_len)) == NULL ||
strcasecmp(colon+1,
proto->common.arg_info[i].class_name) != 0) {
zend_class_entry **fe_ce, **proto_ce;
- TSRMLS_FETCH();
- int found =
zend_lookup_class(fe->common.arg_info[i].class_name,
fe->common.arg_info[i].class_name_len, &fe_ce TSRMLS_CC);
- int found2 =
zend_lookup_class(proto->common.arg_info[i].class_name,
proto->common.arg_info[i].class_name_len, &proto_ce TSRMLS_CC);
+ int found, found2;
+ found =
zend_lookup_class(fe->common.arg_info[i].class_name,
fe->common.arg_info[i].class_name_len, &fe_ce TSRMLS_CC);
+ found2 =
zend_lookup_class(proto->common.arg_info[i].class_name,
proto->common.arg_info[i].class_name_len, &proto_ce TSRMLS_CC);
+
/* Check for class alias */
if (found != SUCCESS || found2 != SUCCESS ||
(*fe_ce)->type == ZEND_INTERNAL_CLASS ||
@@ -2680,11 +2681,11 @@
}
if (child->common.prototype &&
(child->common.prototype->common.fn_flags & ZEND_ACC_ABSTRACT)) {
- if (!zend_do_perform_implementation_check(child,
child->common.prototype)) {
+ if (!zend_do_perform_implementation_check(child,
child->common.prototype TSRMLS_CC)) {
zend_error(E_COMPILE_ERROR, "Declaration of %s::%s()
must be compatible with that of %s::%s()", ZEND_FN_SCOPE_NAME(child),
child->common.function_name, ZEND_FN_SCOPE_NAME(child->common.prototype),
child->common.prototype->common.function_name);
}
} else if (EG(error_reporting) & E_STRICT || EG(user_error_handler)) {
/* Check E_STRICT (or custom error handler) before the check so that we save
some time */
- if (!zend_do_perform_implementation_check(child, parent)) {
+ if (!zend_do_perform_implementation_check(child, parent
TSRMLS_CC)) {
zend_error(E_STRICT, "Declaration of %s::%s() should be
compatible with that of %s::%s()", ZEND_FN_SCOPE_NAME(child),
child->common.function_name, ZEND_FN_SCOPE_NAME(parent),
parent->common.function_name);
}
}
Modified: php/php-src/branches/PHP_5_4/Zend/zend_compile.c
===================================================================
--- php/php-src/branches/PHP_5_4/Zend/zend_compile.c 2011-06-13 17:01:30 UTC
(rev 312125)
+++ php/php-src/branches/PHP_5_4/Zend/zend_compile.c 2011-06-13 17:52:23 UTC
(rev 312126)
@@ -2870,7 +2870,7 @@
}
/* }}} */
-static zend_bool zend_do_perform_implementation_check(const zend_function *fe,
const zend_function *proto) /* {{{ */
+static zend_bool zend_do_perform_implementation_check(const zend_function *fe,
const zend_function *proto TSRMLS_DC) /* {{{ */
{
zend_uint i;
@@ -2924,10 +2924,11 @@
(colon =
zend_memrchr(fe->common.arg_info[i].class_name, '\\',
fe->common.arg_info[i].class_name_len)) == NULL ||
strcasecmp(colon+1,
proto->common.arg_info[i].class_name) != 0) {
zend_class_entry **fe_ce, **proto_ce;
- TSRMLS_FETCH();
- int found =
zend_lookup_class(fe->common.arg_info[i].class_name,
fe->common.arg_info[i].class_name_len, &fe_ce TSRMLS_CC);
- int found2 =
zend_lookup_class(proto->common.arg_info[i].class_name,
proto->common.arg_info[i].class_name_len, &proto_ce TSRMLS_CC);
+ int found, found2;
+ found =
zend_lookup_class(fe->common.arg_info[i].class_name,
fe->common.arg_info[i].class_name_len, &fe_ce TSRMLS_CC);
+ found2 =
zend_lookup_class(proto->common.arg_info[i].class_name,
proto->common.arg_info[i].class_name_len, &proto_ce TSRMLS_CC);
+
/* Check for class alias */
if (found != SUCCESS || found2 != SUCCESS ||
(*fe_ce)->type == ZEND_INTERNAL_CLASS ||
@@ -3017,11 +3018,11 @@
}
if (child->common.prototype &&
(child->common.prototype->common.fn_flags & ZEND_ACC_ABSTRACT)) {
- if (!zend_do_perform_implementation_check(child,
child->common.prototype)) {
+ if (!zend_do_perform_implementation_check(child,
child->common.prototype TSRMLS_CC)) {
zend_error(E_COMPILE_ERROR, "Declaration of %s::%s()
must be compatible with that of %s::%s()", ZEND_FN_SCOPE_NAME(child),
child->common.function_name, ZEND_FN_SCOPE_NAME(child->common.prototype),
child->common.prototype->common.function_name);
}
} else if (EG(error_reporting) & E_STRICT || EG(user_error_handler)) {
/* Check E_STRICT (or custom error handler) before the check so that we save
some time */
- if (!zend_do_perform_implementation_check(child, parent)) {
+ if (!zend_do_perform_implementation_check(child, parent
TSRMLS_CC)) {
zend_error(E_STRICT, "Declaration of %s::%s() should be
compatible with that of %s::%s()", ZEND_FN_SCOPE_NAME(child),
child->common.function_name, ZEND_FN_SCOPE_NAME(parent),
parent->common.function_name);
}
}
Modified: php/php-src/trunk/Zend/zend_compile.c
===================================================================
--- php/php-src/trunk/Zend/zend_compile.c 2011-06-13 17:01:30 UTC (rev
312125)
+++ php/php-src/trunk/Zend/zend_compile.c 2011-06-13 17:52:23 UTC (rev
312126)
@@ -2870,7 +2870,7 @@
}
/* }}} */
-static zend_bool zend_do_perform_implementation_check(const zend_function *fe,
const zend_function *proto) /* {{{ */
+static zend_bool zend_do_perform_implementation_check(const zend_function *fe,
const zend_function *proto TSRMLS_DC) /* {{{ */
{
zend_uint i;
@@ -2924,10 +2924,11 @@
(colon =
zend_memrchr(fe->common.arg_info[i].class_name, '\\',
fe->common.arg_info[i].class_name_len)) == NULL ||
strcasecmp(colon+1,
proto->common.arg_info[i].class_name) != 0) {
zend_class_entry **fe_ce, **proto_ce;
- TSRMLS_FETCH();
- int found =
zend_lookup_class(fe->common.arg_info[i].class_name,
fe->common.arg_info[i].class_name_len, &fe_ce TSRMLS_CC);
- int found2 =
zend_lookup_class(proto->common.arg_info[i].class_name,
proto->common.arg_info[i].class_name_len, &proto_ce TSRMLS_CC);
+ int found, found2;
+ found =
zend_lookup_class(fe->common.arg_info[i].class_name,
fe->common.arg_info[i].class_name_len, &fe_ce TSRMLS_CC);
+ found2 =
zend_lookup_class(proto->common.arg_info[i].class_name,
proto->common.arg_info[i].class_name_len, &proto_ce TSRMLS_CC);
+
/* Check for class alias */
if (found != SUCCESS || found2 != SUCCESS ||
(*fe_ce)->type == ZEND_INTERNAL_CLASS ||
@@ -3017,11 +3018,11 @@
}
if (child->common.prototype &&
(child->common.prototype->common.fn_flags & ZEND_ACC_ABSTRACT)) {
- if (!zend_do_perform_implementation_check(child,
child->common.prototype)) {
+ if (!zend_do_perform_implementation_check(child,
child->common.prototype TSRMLS_CC)) {
zend_error(E_COMPILE_ERROR, "Declaration of %s::%s()
must be compatible with that of %s::%s()", ZEND_FN_SCOPE_NAME(child),
child->common.function_name, ZEND_FN_SCOPE_NAME(child->common.prototype),
child->common.prototype->common.function_name);
}
} else if (EG(error_reporting) & E_STRICT || EG(user_error_handler)) {
/* Check E_STRICT (or custom error handler) before the check so that we save
some time */
- if (!zend_do_perform_implementation_check(child, parent)) {
+ if (!zend_do_perform_implementation_check(child, parent
TSRMLS_CC)) {
zend_error(E_STRICT, "Declaration of %s::%s() should be
compatible with that of %s::%s()", ZEND_FN_SCOPE_NAME(child),
child->common.function_name, ZEND_FN_SCOPE_NAME(parent),
parent->common.function_name);
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
