derick Sat Jul 19 19:24:07 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/spl spl_iterators.c
Log:
- MFH: Fixed ZTS build.
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_iterators.c?r1=1.73.2.30.2.28.2.8&r2=1.73.2.30.2.28.2.9&diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.73.2.30.2.28.2.8
php-src/ext/spl/spl_iterators.c:1.73.2.30.2.28.2.9
--- php-src/ext/spl/spl_iterators.c:1.73.2.30.2.28.2.8 Sat Jul 19 15:49:21 2008
+++ php-src/ext/spl/spl_iterators.c Sat Jul 19 19:24:07 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_iterators.c,v 1.73.2.30.2.28.2.8 2008/07/19 15:49:21 helly Exp $ */
+/* $Id: spl_iterators.c,v 1.73.2.30.2.28.2.9 2008/07/19 19:24:07 derick Exp $
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -416,7 +416,7 @@
spl_recursive_it_rewind
};
-static void spl_recursive_it_it_construct(INTERNAL_FUNCTION_PARAMETERS,
zend_class_entry *ce_base, zend_class_entry *ce_inner, recursive_it_it_type
rit_type TSRMLS_DC)
+static void spl_recursive_it_it_construct(INTERNAL_FUNCTION_PARAMETERS,
zend_class_entry *ce_base, zend_class_entry *ce_inner, recursive_it_it_type
rit_type)
{
zval *object = getThis();
spl_recursive_it_object *intern;
@@ -447,7 +447,7 @@
} else {
ZVAL_LONG(caching_it_flags,
CIT_CATCH_GET_CHILD);
}
-
spl_instantiate_arg_ex2(spl_ce_RecursiveCachingIterator, &caching_it, 1,
iterator, caching_it_flags);
+
spl_instantiate_arg_ex2(spl_ce_RecursiveCachingIterator, &caching_it, 1,
iterator, caching_it_flags TSRMLS_CC);
zval_ptr_dtor(&caching_it_flags);
if (inc_refcount == 0 && iterator) {
zval_ptr_dtor(&iterator);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
