stas Thu, 21 Jan 2010 18:07:28 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=293813
Log:
fix TS build
Changed paths:
U
php/php-src/branches/PHP_5_3/ext/intl/resourcebundle/resourcebundle_class.c
U
php/php-src/branches/PHP_5_3/ext/intl/resourcebundle/resourcebundle_iterator.c
U php/php-src/trunk/ext/intl/resourcebundle/resourcebundle_class.c
U php/php-src/trunk/ext/intl/resourcebundle/resourcebundle_iterator.c
Modified:
php/php-src/branches/PHP_5_3/ext/intl/resourcebundle/resourcebundle_class.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/intl/resourcebundle/resourcebundle_class.c
2010-01-21 17:49:38 UTC (rev 293812)
+++ php/php-src/branches/PHP_5_3/ext/intl/resourcebundle/resourcebundle_class.c
2010-01-21 18:07:28 UTC (rev 293813)
@@ -87,7 +87,7 @@
char * pbuf;
zval *object = return_value;
- ResourceBundle_object *rb = (ResourceBundle_object *)
zend_object_store_get_object( object );
+ ResourceBundle_object *rb = (ResourceBundle_object *)
zend_object_store_get_object( object TSRMLS_CC);
intl_error_reset( NULL TSRMLS_CC );
@@ -247,7 +247,7 @@
/* {{{ resourcebundle_array_count */
int resourcebundle_array_count(zval *object, long *count TSRMLS_DC)
{
- ResourceBundle_object *rb = (ResourceBundle_object *)
zend_object_store_get_object( object );
+ ResourceBundle_object *rb = (ResourceBundle_object *)
zend_object_store_get_object( object TSRMLS_CC);
*count = ures_getSize( rb->me );
Modified:
php/php-src/branches/PHP_5_3/ext/intl/resourcebundle/resourcebundle_iterator.c
===================================================================
---
php/php-src/branches/PHP_5_3/ext/intl/resourcebundle/resourcebundle_iterator.c
2010-01-21 17:49:38 UTC (rev 293812)
+++
php/php-src/branches/PHP_5_3/ext/intl/resourcebundle/resourcebundle_iterator.c
2010-01-21 18:07:28 UTC (rev 293813)
@@ -94,7 +94,7 @@
{
ResourceBundle_iterator *iterator = (ResourceBundle_iterator *) iter;
if (!iterator->current) {
- resourcebundle_iterator_read( iterator );
+ resourcebundle_iterator_read( iterator TSRMLS_CC);
}
*data = &iterator->current;
}
@@ -106,7 +106,7 @@
ResourceBundle_iterator *iterator = (ResourceBundle_iterator *) iter;
if (!iterator->current) {
- resourcebundle_iterator_read( iterator );
+ resourcebundle_iterator_read( iterator TSRMLS_CC);
}
if (iterator->is_table) {
*str_key = estrdup( iterator->currentkey );
Modified: php/php-src/trunk/ext/intl/resourcebundle/resourcebundle_class.c
===================================================================
--- php/php-src/trunk/ext/intl/resourcebundle/resourcebundle_class.c
2010-01-21 17:49:38 UTC (rev 293812)
+++ php/php-src/trunk/ext/intl/resourcebundle/resourcebundle_class.c
2010-01-21 18:07:28 UTC (rev 293813)
@@ -86,7 +86,7 @@
char * pbuf;
zval *object = return_value;
- ResourceBundle_object *rb = (ResourceBundle_object *)
zend_object_store_get_object( object );
+ ResourceBundle_object *rb = (ResourceBundle_object *)
zend_object_store_get_object( object TSRMLS_CC);
intl_error_reset( NULL TSRMLS_CC );
@@ -253,7 +253,7 @@
/* {{{ resourcebundle_array_count */
int resourcebundle_array_count(zval *object, long *count TSRMLS_DC)
{
- ResourceBundle_object *rb = (ResourceBundle_object *)
zend_object_store_get_object( object );
+ ResourceBundle_object *rb = (ResourceBundle_object *)
zend_object_store_get_object( object TSRMLS_CC);
*count = ures_getSize( rb->me );
Modified: php/php-src/trunk/ext/intl/resourcebundle/resourcebundle_iterator.c
===================================================================
--- php/php-src/trunk/ext/intl/resourcebundle/resourcebundle_iterator.c
2010-01-21 17:49:38 UTC (rev 293812)
+++ php/php-src/trunk/ext/intl/resourcebundle/resourcebundle_iterator.c
2010-01-21 18:07:28 UTC (rev 293813)
@@ -94,7 +94,7 @@
{
ResourceBundle_iterator *iterator = (ResourceBundle_iterator *) iter;
if (!iterator->current) {
- resourcebundle_iterator_read( iterator );
+ resourcebundle_iterator_read( iterator TSRMLS_CC);
}
*data = &iterator->current;
}
@@ -106,7 +106,7 @@
ResourceBundle_iterator *iterator = (ResourceBundle_iterator *) iter;
if (!iterator->current) {
- resourcebundle_iterator_read( iterator );
+ resourcebundle_iterator_read( iterator TSRMLS_CC);
}
if (iterator->is_table) {
*str_key = estrdup( iterator->currentkey );
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
