felipe Tue, 16 Aug 2011 12:01:36 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=315017
Log:
- Fixed ZTS build
Changed paths:
U php/php-src/branches/PHP_5_4/Zend/zend_execute.c
U php/php-src/trunk/Zend/zend_execute.c
Modified: php/php-src/branches/PHP_5_4/Zend/zend_execute.c
===================================================================
--- php/php-src/branches/PHP_5_4/Zend/zend_execute.c 2011-08-16 12:01:28 UTC
(rev 315016)
+++ php/php-src/branches/PHP_5_4/Zend/zend_execute.c 2011-08-16 12:01:36 UTC
(rev 315017)
@@ -639,7 +639,7 @@
break;
case IS_CALLABLE:
- if (!zend_is_callable(arg,
IS_CALLABLE_CHECK_SILENT, NULL) && (Z_TYPE_P(arg) != IS_NULL ||
!cur_arg_info->allow_null)) {
+ if (!zend_is_callable(arg,
IS_CALLABLE_CHECK_SILENT, NULL TSRMLS_CC) && (Z_TYPE_P(arg) != IS_NULL ||
!cur_arg_info->allow_null)) {
return
zend_verify_arg_error(E_RECOVERABLE_ERROR, zf, arg_num, "be callable", "",
zend_zval_type_name(arg), "" TSRMLS_CC);
}
break;
Modified: php/php-src/trunk/Zend/zend_execute.c
===================================================================
--- php/php-src/trunk/Zend/zend_execute.c 2011-08-16 12:01:28 UTC (rev
315016)
+++ php/php-src/trunk/Zend/zend_execute.c 2011-08-16 12:01:36 UTC (rev
315017)
@@ -639,7 +639,7 @@
break;
case IS_CALLABLE:
- if (!zend_is_callable(arg,
IS_CALLABLE_CHECK_SILENT, NULL) && (Z_TYPE_P(arg) != IS_NULL ||
!cur_arg_info->allow_null)) {
+ if (!zend_is_callable(arg,
IS_CALLABLE_CHECK_SILENT, NULL TSRMLS_CC) && (Z_TYPE_P(arg) != IS_NULL ||
!cur_arg_info->allow_null)) {
return
zend_verify_arg_error(E_RECOVERABLE_ERROR, zf, arg_num, "be callable", "",
zend_zval_type_name(arg), "" TSRMLS_CC);
}
break;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
