]> granicus.if.org Git - php/commitdiff
- missing patch for the resourcebunlde support in intl
authorPierre Joye <pajoye@php.net>
Thu, 11 Feb 2010 23:55:19 +0000 (23:55 +0000)
committerPierre Joye <pajoye@php.net>
Thu, 11 Feb 2010 23:55:19 +0000 (23:55 +0000)
ext/intl/resourcebundle/resourcebundle_class.c
ext/intl/resourcebundle/resourcebundle_iterator.c
ext/intl/tests/resourcebundle.build [moved from ext/intl/tests/rb_build.php with 100% similarity]

index 9d51feb2687f529810af747f629f76b90a1628a1..1c9a689b2de409fd0ecc35580a19b0c260a06709 100644 (file)
@@ -87,7 +87,7 @@ static void resourcebundle_ctor(INTERNAL_FUNCTION_PARAMETERS)
        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 @@ PHP_FUNCTION( resourcebundle_get )
 /* {{{ 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 );
 
index d90ab7166488f8ca33e687d66e8e1070e0bf3064..16e1b928791ad62d9b4d85958c64d3171a4158fa 100644 (file)
@@ -94,7 +94,7 @@ static void resourcebundle_iterator_current( zend_object_iterator *iter, zval **
 {
        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 @@ static int resourcebundle_iterator_key( zend_object_iterator *iter, char **str_k
        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 );