Merge remote-tracking branch 'origin/native-tls'POST_NATIVE_TLS_MERGE

6 files changed, 64 insertions, 64 deletions

diff --git a/ext/intl/resourcebundle/resourcebundle.c b/ext/intl/resourcebundle/resourcebundle.c
index 9b6b734ed6..62a268c07f 100644
--- a/ext/intl/resourcebundle/resourcebundle.c
+++ b/ext/intl/resourcebundle/resourcebundle.c
@@ -24,7 +24,7 @@
 #include "resourcebundle/resourcebundle_class.h"
 
 /* {{{ ResourceBundle_extract_value */
-void resourcebundle_extract_value( zval *return_value, ResourceBundle_object *source TSRMLS_DC ) 
+void resourcebundle_extract_value( zval *return_value, ResourceBundle_object *source ) 
 {
 	UResType               restype;
 	const UChar*           ufield;
@@ -71,11 +71,11 @@ void resourcebundle_extract_value( zval *return_value, ResourceBundle_object *so
 			newrb = Z_INTL_RESOURCEBUNDLE_P(return_value);
 			newrb->me = source->child;
 			source->child = NULL;
-			intl_errors_reset(INTL_DATA_ERROR_P(source) TSRMLS_CC);
+			intl_errors_reset(INTL_DATA_ERROR_P(source));
 			break;
 
 		default:
-			intl_errors_set(INTL_DATA_ERROR_P(source), U_ILLEGAL_ARGUMENT_ERROR, "Unknown resource type", 0 TSRMLS_CC);
+			intl_errors_set(INTL_DATA_ERROR_P(source), U_ILLEGAL_ARGUMENT_ERROR, "Unknown resource type", 0);
 			RETURN_FALSE;
 			break;
 	}
diff --git a/ext/intl/resourcebundle/resourcebundle.h b/ext/intl/resourcebundle/resourcebundle.h
index e5aa9f092b..46a6ad5766 100644
--- a/ext/intl/resourcebundle/resourcebundle.h
+++ b/ext/intl/resourcebundle/resourcebundle.h
@@ -23,6 +23,6 @@
 
 #include "resourcebundle/resourcebundle_class.h"
 
-void resourcebundle_extract_value( zval *target, ResourceBundle_object *source TSRMLS_DC);
+void resourcebundle_extract_value( zval *target, ResourceBundle_object *source);
 
 #endif // #ifndef RESOURCEBUNDLE_CLASS_H
diff --git a/ext/intl/resourcebundle/resourcebundle_class.c b/ext/intl/resourcebundle/resourcebundle_class.c
index 0fbf7931d4..67e2bae855 100644
--- a/ext/intl/resourcebundle/resourcebundle_class.c
+++ b/ext/intl/resourcebundle/resourcebundle_class.c
@@ -35,12 +35,12 @@ zend_class_entry *ResourceBundle_ce_ptr = NULL;
 static zend_object_handlers ResourceBundle_object_handlers;
 
 /* {{{ ResourceBundle_object_dtor */
-static void ResourceBundle_object_destroy( zend_object *object TSRMLS_DC )
+static void ResourceBundle_object_destroy( zend_object *object )
 {
 	ResourceBundle_object *rb = php_intl_resourcebundle_fetch_object(object);
 
 	// only free local errors
-	intl_error_reset( INTL_DATA_ERROR_P(rb) TSRMLS_CC );
+	intl_error_reset( INTL_DATA_ERROR_P(rb) );
 
 	if (rb->me) {
 		ures_close( rb->me );
@@ -49,21 +49,21 @@ static void ResourceBundle_object_destroy( zend_object *object TSRMLS_DC )
 		ures_close( rb->child );
 	}
 
-	//???zend_object_std_dtor( object TSRMLS_CC );
+	//???zend_object_std_dtor( object );
 }
 /* }}} */
 
 /* {{{ ResourceBundle_object_create */
-static zend_object *ResourceBundle_object_create( zend_class_entry *ce TSRMLS_DC )
+static zend_object *ResourceBundle_object_create( zend_class_entry *ce )
 {
 	ResourceBundle_object *rb;
 
 	rb = ecalloc( 1, sizeof(ResourceBundle_object) + sizeof(zval) * (ce->default_properties_count - 1) );
 
-	zend_object_std_init( &rb->zend, ce TSRMLS_CC );
+	zend_object_std_init( &rb->zend, ce );
 	object_properties_init( &rb->zend, ce);
 
-	intl_error_init( INTL_DATA_ERROR_P(rb) TSRMLS_CC );
+	intl_error_init( INTL_DATA_ERROR_P(rb) );
 	rb->me = NULL;
 	rb->child = NULL;
 
@@ -85,13 +85,13 @@ static void resourcebundle_ctor(INTERNAL_FUNCTION_PARAMETERS)
 	zval                  *object = return_value;
 	ResourceBundle_object *rb = Z_INTL_RESOURCEBUNDLE_P( object );
 
-	intl_error_reset( NULL TSRMLS_CC );
+	intl_error_reset( NULL );
 
-	if( zend_parse_parameters( ZEND_NUM_ARGS() TSRMLS_CC, "s!s!|b", 
+	if( zend_parse_parameters( ZEND_NUM_ARGS(), "s!s!|b", 
 		&locale, &locale_len, &bundlename, &bundlename_len, &fallback ) == FAILURE )
 	{
 		intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-			"resourcebundle_ctor: unable to parse input parameters", 0 TSRMLS_CC );
+			"resourcebundle_ctor: unable to parse input parameters", 0 );
 		Z_OBJ_P(return_value) = NULL;
 		return;
 	}
@@ -99,7 +99,7 @@ static void resourcebundle_ctor(INTERNAL_FUNCTION_PARAMETERS)
 	INTL_CHECK_LOCALE_LEN_OBJ(locale_len, return_value);
 	
 	if (locale == NULL) {
-		locale = intl_locale_get_default(TSRMLS_C);
+		locale = intl_locale_get_default();
 	}
 
 	if (fallback) {
@@ -113,13 +113,13 @@ static void resourcebundle_ctor(INTERNAL_FUNCTION_PARAMETERS)
 	if (!fallback && (INTL_DATA_ERROR_CODE(rb) == U_USING_FALLBACK_WARNING ||
 			INTL_DATA_ERROR_CODE(rb) == U_USING_DEFAULT_WARNING)) {
 		char *pbuf;
-		intl_errors_set_code(NULL, INTL_DATA_ERROR_CODE(rb) TSRMLS_CC);
+		intl_errors_set_code(NULL, INTL_DATA_ERROR_CODE(rb));
 		spprintf(&pbuf, 0, "resourcebundle_ctor: Cannot load libICU resource "
 				"'%s' without fallback from %s to %s",
 				bundlename ? bundlename : "(default data)", locale,
 				ures_getLocaleByType(
 					rb->me, ULOC_ACTUAL_LOCALE, &INTL_DATA_ERROR_CODE(rb)));
-		intl_errors_set_custom_msg(INTL_DATA_ERROR_P(rb), pbuf, 1 TSRMLS_CC);
+		intl_errors_set_custom_msg(INTL_DATA_ERROR_P(rb), pbuf, 1);
 		efree(pbuf);
 		Z_OBJ_P(return_value) = NULL;
 	}
@@ -145,7 +145,7 @@ PHP_METHOD( ResourceBundle, __construct )
 	resourcebundle_ctor(INTERNAL_FUNCTION_PARAM_PASSTHRU);
 
 	if (Z_TYPE_P(return_value) == IS_OBJECT && Z_OBJ_P(return_value) == NULL) {
-		zend_object_store_ctor_failed(Z_OBJ(orig_this) TSRMLS_CC);
+		zend_object_store_ctor_failed(Z_OBJ(orig_this));
 		zval_dtor(&orig_this);
 		ZEND_CTOR_MAKE_NULL();
 	}
@@ -166,7 +166,7 @@ PHP_FUNCTION( resourcebundle_create )
 /* }}} */
 
 /* {{{ resourcebundle_array_fetch */
-static void resourcebundle_array_fetch(zval *object, zval *offset, zval *return_value, int fallback TSRMLS_DC) 
+static void resourcebundle_array_fetch(zval *object, zval *offset, zval *return_value, int fallback) 
 {
 	int32_t     meindex = 0;
 	char *      mekey = NULL;
@@ -174,7 +174,7 @@ static void resourcebundle_array_fetch(zval *object, zval *offset, zval *return_
 	char         *pbuf;
 	ResourceBundle_object *rb;
 
-	intl_error_reset( NULL TSRMLS_CC );	
+	intl_error_reset( NULL );	
 	RESOURCEBUNDLE_METHOD_FETCH_OBJECT;
 
 	if(Z_TYPE_P(offset) == IS_LONG) {
@@ -186,18 +186,18 @@ static void resourcebundle_array_fetch(zval *object, zval *offset, zval *return_
 		rb->child = ures_getByKey(rb->me, mekey, rb->child, &INTL_DATA_ERROR_CODE(rb) );
 	} else {
 		intl_errors_set(INTL_DATA_ERROR_P(rb), U_ILLEGAL_ARGUMENT_ERROR,	
-			"resourcebundle_get: index should be integer or string", 0 TSRMLS_CC);
+			"resourcebundle_get: index should be integer or string", 0);
 		RETURN_NULL();
 	}
 
-	intl_error_set_code( NULL, INTL_DATA_ERROR_CODE(rb) TSRMLS_CC );	
+	intl_error_set_code( NULL, INTL_DATA_ERROR_CODE(rb) );	
 	if (U_FAILURE(INTL_DATA_ERROR_CODE(rb))) {
 		if (is_numeric) {
 			spprintf( &pbuf, 0, "Cannot load resource element %d", meindex );
 		} else {
 			spprintf( &pbuf, 0, "Cannot load resource element '%s'", mekey );
 		}
-		intl_errors_set_custom_msg( INTL_DATA_ERROR_P(rb), pbuf, 1 TSRMLS_CC );
+		intl_errors_set_custom_msg( INTL_DATA_ERROR_P(rb), pbuf, 1 );
 		efree(pbuf);
 		RETURN_NULL();
 	}
@@ -210,23 +210,23 @@ static void resourcebundle_array_fetch(zval *object, zval *offset, zval *return_
 		} else {
 			spprintf( &pbuf, 0, "Cannot load element '%s' without fallback from to %s", mekey, locale );
 		}
-		intl_errors_set_custom_msg( INTL_DATA_ERROR_P(rb), pbuf, 1 TSRMLS_CC );
+		intl_errors_set_custom_msg( INTL_DATA_ERROR_P(rb), pbuf, 1 );
 		efree(pbuf);
 		RETURN_NULL();
 	}
 
-	resourcebundle_extract_value( return_value, rb TSRMLS_CC );
+	resourcebundle_extract_value( return_value, rb );
 }
 /* }}} */
 
 /* {{{ resourcebundle_array_get */
-zval *resourcebundle_array_get(zval *object, zval *offset, int type, zval *rv TSRMLS_DC) 
+zval *resourcebundle_array_get(zval *object, zval *offset, int type, zval *rv) 
 {
 	if(offset == NULL) {
 		php_error( E_ERROR, "Cannot apply [] to ResourceBundle object" );
 	}
 	ZVAL_NULL(rv);
-	resourcebundle_array_fetch(object, offset, rv, 1 TSRMLS_CC);
+	resourcebundle_array_fetch(object, offset, rv, 1);
 	return rv;
 }
 /* }}} */
@@ -248,25 +248,25 @@ PHP_FUNCTION( resourcebundle_get )
 	zval *		offset;
 	zval *      object;
 
-	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oz|b",	&object, ResourceBundle_ce_ptr, &offset, &fallback ) == FAILURE) {
+	if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Oz|b",	&object, ResourceBundle_ce_ptr, &offset, &fallback ) == FAILURE) {
 		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,	
-			"resourcebundle_get: unable to parse input params", 0 TSRMLS_CC);
+			"resourcebundle_get: unable to parse input params", 0);
 		RETURN_FALSE;
 	}
 
-	resourcebundle_array_fetch(object, offset, return_value, fallback TSRMLS_CC);
+	resourcebundle_array_fetch(object, offset, return_value, fallback);
 }
 /* }}} */
 
 /* {{{ resourcebundle_array_count */
-int resourcebundle_array_count(zval *object, zend_long *count TSRMLS_DC) 
+int resourcebundle_array_count(zval *object, zend_long *count) 
 {
 	ResourceBundle_object *rb;
 	RESOURCEBUNDLE_METHOD_FETCH_OBJECT_NO_CHECK;
 
 	if (rb->me == NULL) {
 		intl_errors_set(&rb->error, U_ILLEGAL_ARGUMENT_ERROR,
-				"Found unconstructed ResourceBundle", 0 TSRMLS_CC);
+				"Found unconstructed ResourceBundle", 0);
 		return 0;
 	}
 
@@ -290,9 +290,9 @@ PHP_FUNCTION( resourcebundle_count )
 	int32_t                len;
 	RESOURCEBUNDLE_METHOD_INIT_VARS;
 
-	if( zend_parse_method_parameters( ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &object, ResourceBundle_ce_ptr ) == FAILURE ) {
+	if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "O", &object, ResourceBundle_ce_ptr ) == FAILURE ) {
 		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,	
-			"resourcebundle_count: unable to parse input params", 0 TSRMLS_CC);
+			"resourcebundle_count: unable to parse input params", 0);
 		RETURN_FALSE;
 	}
 
@@ -321,12 +321,12 @@ PHP_FUNCTION( resourcebundle_locales )
 	UEnumeration *icuenum;
 	UErrorCode   icuerror = U_ZERO_ERROR;
 
-	intl_errors_reset( NULL TSRMLS_CC );
+	intl_errors_reset( NULL );
 
-	if( zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &bundlename, &bundlename_len ) == FAILURE )
+	if( zend_parse_parameters(ZEND_NUM_ARGS(), "s", &bundlename, &bundlename_len ) == FAILURE )
 	{
 		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,	
-			"resourcebundle_locales: unable to parse input params", 0 TSRMLS_CC);
+			"resourcebundle_locales: unable to parse input params", 0);
 		RETURN_FALSE;
 	}
 
@@ -362,11 +362,11 @@ PHP_FUNCTION( resourcebundle_get_error_code )
 {
 	RESOURCEBUNDLE_METHOD_INIT_VARS;
 
-	if( zend_parse_method_parameters( ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O",
+	if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "O",
 		&object, ResourceBundle_ce_ptr ) == FAILURE )
 	{
 		intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-			"resourcebundle_get_error_code: unable to parse input params", 0 TSRMLS_CC );
+			"resourcebundle_get_error_code: unable to parse input params", 0 );
 		RETURN_FALSE;
 	}
 
@@ -390,16 +390,16 @@ PHP_FUNCTION( resourcebundle_get_error_message )
 	zend_string* message = NULL;
 	RESOURCEBUNDLE_METHOD_INIT_VARS;
 
-	if( zend_parse_method_parameters( ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O",
+	if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "O",
 		&object, ResourceBundle_ce_ptr ) == FAILURE )
 	{
 		intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-			"resourcebundle_get_error_message: unable to parse input params", 0 TSRMLS_CC );
+			"resourcebundle_get_error_message: unable to parse input params", 0 );
 		RETURN_FALSE;
 	}
 
 	rb = Z_INTL_RESOURCEBUNDLE_P( object );
-	message = intl_error_get_message(INTL_DATA_ERROR_P(rb) TSRMLS_CC);
+	message = intl_error_get_message(INTL_DATA_ERROR_P(rb));
 	RETURN_STR(message);
 }
 /* }}} */
@@ -422,7 +422,7 @@ static zend_function_entry ResourceBundle_class_functions[] = {
 /* {{{ resourcebundle_register_class
  * Initialize 'ResourceBundle' class
  */
-void resourcebundle_register_class( TSRMLS_D )
+void resourcebundle_register_class( void )
 {
 	zend_class_entry ce;
 
@@ -431,7 +431,7 @@ void resourcebundle_register_class( TSRMLS_D )
 	ce.create_object = ResourceBundle_object_create;
 	ce.get_iterator = resourcebundle_get_iterator;
 
-	ResourceBundle_ce_ptr = zend_register_internal_class( &ce TSRMLS_CC );
+	ResourceBundle_ce_ptr = zend_register_internal_class( &ce );
 
 	if( !ResourceBundle_ce_ptr )
 	{
@@ -446,7 +446,7 @@ void resourcebundle_register_class( TSRMLS_D )
 	ResourceBundle_object_handlers.read_dimension = resourcebundle_array_get;
 	ResourceBundle_object_handlers.count_elements = resourcebundle_array_count;
 
-	zend_class_implements(ResourceBundle_ce_ptr TSRMLS_CC, 1, zend_ce_traversable);
+	zend_class_implements(ResourceBundle_ce_ptr, 1, zend_ce_traversable);
 }
 /* }}} */
 
diff --git a/ext/intl/resourcebundle/resourcebundle_class.h b/ext/intl/resourcebundle/resourcebundle_class.h
index 403b6beb17..0ac3635ba8 100644
--- a/ext/intl/resourcebundle/resourcebundle_class.h
+++ b/ext/intl/resourcebundle/resourcebundle_class.h
@@ -43,14 +43,14 @@ static inline ResourceBundle_object *php_intl_resourcebundle_fetch_object(zend_o
 	INTL_METHOD_FETCH_OBJECT(INTL_RESOURCEBUNDLE, rb);					\
 	if (RESOURCEBUNDLE_OBJECT(rb) == NULL) {						\
 		intl_errors_set(&rb->error, U_ILLEGAL_ARGUMENT_ERROR,		\
-				"Found unconstructed ResourceBundle", 0 TSRMLS_CC);	\
+				"Found unconstructed ResourceBundle", 0);	\
 		RETURN_FALSE;												\
 	}
 
 
 #define RESOURCEBUNDLE_OBJECT(rb)			(rb)->me
 
-void resourcebundle_register_class( TSRMLS_D );
+void resourcebundle_register_class( void );
 extern zend_class_entry *ResourceBundle_ce_ptr;
 
 PHP_FUNCTION( resourcebundle_create );
diff --git a/ext/intl/resourcebundle/resourcebundle_iterator.c b/ext/intl/resourcebundle/resourcebundle_iterator.c
index cf38c6b676..8243e69268 100644
--- a/ext/intl/resourcebundle/resourcebundle_iterator.c
+++ b/ext/intl/resourcebundle/resourcebundle_iterator.c
@@ -29,7 +29,7 @@
  */
 
 /* {{{ resourcebundle_iterator_read */
-static void resourcebundle_iterator_read( ResourceBundle_iterator *iterator TSRMLS_DC ) 
+static void resourcebundle_iterator_read( ResourceBundle_iterator *iterator ) 
 {
 	UErrorCode icuerror = U_ZERO_ERROR;
 	ResourceBundle_object *rb = iterator->subject;
@@ -41,17 +41,17 @@ static void resourcebundle_iterator_read( ResourceBundle_iterator *iterator TSRM
 		if (iterator->is_table) {
 			iterator->currentkey = estrdup( ures_getKey( rb->child ) );
 		}
-		resourcebundle_extract_value( &iterator->current, rb TSRMLS_CC );
+		resourcebundle_extract_value( &iterator->current, rb );
 	}
 	else {
-		// zend_throw_exception( spl_ce_OutOfRangeException, "Running past end of ResourceBundle", 0 TSRMLS_CC);
+		// zend_throw_exception( spl_ce_OutOfRangeException, "Running past end of ResourceBundle", 0);
 		ZVAL_UNDEF(&iterator->current);
 	}
 }
 /* }}} */
 
 /* {{{ resourcebundle_iterator_invalidate */
-static void resourcebundle_iterator_invalidate( zend_object_iterator *iter TSRMLS_DC ) 
+static void resourcebundle_iterator_invalidate( zend_object_iterator *iter ) 
 {
 	ResourceBundle_iterator *iterator = (ResourceBundle_iterator *) iter;
 
@@ -67,19 +67,19 @@ static void resourcebundle_iterator_invalidate( zend_object_iterator *iter TSRML
 /* }}} */
 
 /* {{{ resourcebundle_iterator_dtor */
-static void resourcebundle_iterator_dtor( zend_object_iterator *iter TSRMLS_DC )
+static void resourcebundle_iterator_dtor( zend_object_iterator *iter )
 {
 	ResourceBundle_iterator *iterator = (ResourceBundle_iterator *) iter;
 	zval                    *object = &iterator->intern.data;
 
-	resourcebundle_iterator_invalidate( iter TSRMLS_CC );
+	resourcebundle_iterator_invalidate( iter );
 
 	zval_ptr_dtor(object);
 }
 /* }}} */
 
 /* {{{ resourcebundle_iterator_has_more */
-static int resourcebundle_iterator_has_more( zend_object_iterator *iter TSRMLS_DC )
+static int resourcebundle_iterator_has_more( zend_object_iterator *iter )
 {
 	ResourceBundle_iterator *iterator = (ResourceBundle_iterator *) iter;
 	return (iterator->i < iterator->length) ? SUCCESS : FAILURE;
@@ -87,23 +87,23 @@ static int resourcebundle_iterator_has_more( zend_object_iterator *iter TSRMLS_D
 /* }}} */
 
 /* {{{ resourcebundle_iterator_current */
-static zval *resourcebundle_iterator_current( zend_object_iterator *iter TSRMLS_DC )
+static zval *resourcebundle_iterator_current( zend_object_iterator *iter )
 {
 	ResourceBundle_iterator *iterator = (ResourceBundle_iterator *) iter;
 	if (Z_ISUNDEF(iterator->current)) {
-		resourcebundle_iterator_read( iterator TSRMLS_CC);
+		resourcebundle_iterator_read( iterator);
 	}
 	return &iterator->current;
 }
 /* }}} */
 
 /* {{{ resourcebundle_iterator_key */
-static void resourcebundle_iterator_key( zend_object_iterator *iter, zval *key TSRMLS_DC )
+static void resourcebundle_iterator_key( zend_object_iterator *iter, zval *key )
 {
 	ResourceBundle_iterator *iterator = (ResourceBundle_iterator *) iter;
 
 	if (Z_ISUNDEF(iterator->current)) {
-		resourcebundle_iterator_read( iterator TSRMLS_CC);
+		resourcebundle_iterator_read( iterator);
 	}
 
 	if (iterator->is_table) {
@@ -115,22 +115,22 @@ static void resourcebundle_iterator_key( zend_object_iterator *iter, zval *key T
 /* }}} */
 
 /* {{{ resourcebundle_iterator_step */
-static void resourcebundle_iterator_step( zend_object_iterator *iter TSRMLS_DC )
+static void resourcebundle_iterator_step( zend_object_iterator *iter )
 {
 	ResourceBundle_iterator *iterator = (ResourceBundle_iterator *) iter;
 
 	iterator->i++;
-	resourcebundle_iterator_invalidate( iter TSRMLS_CC );
+	resourcebundle_iterator_invalidate( iter );
 }
 /* }}} */
 
 /* {{{ resourcebundle_iterator_has_reset */
-static void resourcebundle_iterator_reset( zend_object_iterator *iter TSRMLS_DC )
+static void resourcebundle_iterator_reset( zend_object_iterator *iter )
 {
 	ResourceBundle_iterator *iterator = (ResourceBundle_iterator *) iter;
 
 	iterator->i = 0;
-	resourcebundle_iterator_invalidate( iter TSRMLS_CC );
+	resourcebundle_iterator_invalidate( iter );
 }
 /* }}} */
 
@@ -147,7 +147,7 @@ static zend_object_iterator_funcs resourcebundle_iterator_funcs = {
 /* }}} */
 
 /* {{{ resourcebundle_get_iterator */
-zend_object_iterator *resourcebundle_get_iterator( zend_class_entry *ce, zval *object, int byref TSRMLS_DC )
+zend_object_iterator *resourcebundle_get_iterator( zend_class_entry *ce, zval *object, int byref )
 {
 	ResourceBundle_object   *rb = Z_INTL_RESOURCEBUNDLE_P(object );
 	ResourceBundle_iterator *iterator = emalloc( sizeof( ResourceBundle_iterator ) );
@@ -156,7 +156,7 @@ zend_object_iterator *resourcebundle_get_iterator( zend_class_entry *ce, zval *o
 	     php_error( E_ERROR, "ResourceBundle does not support writable iterators" );
 	}
 
-	zend_iterator_init(&iterator->intern TSRMLS_CC);
+	zend_iterator_init(&iterator->intern);
 	ZVAL_COPY(&iterator->intern.data, object);
 	iterator->intern.funcs = &resourcebundle_iterator_funcs;
 
diff --git a/ext/intl/resourcebundle/resourcebundle_iterator.h b/ext/intl/resourcebundle/resourcebundle_iterator.h
index b28fa91638..f27b76ad8b 100644
--- a/ext/intl/resourcebundle/resourcebundle_iterator.h
+++ b/ext/intl/resourcebundle/resourcebundle_iterator.h
@@ -31,6 +31,6 @@ typedef struct {
 	zend_long                  i;
 } ResourceBundle_iterator;
 
-zend_object_iterator *resourcebundle_get_iterator( zend_class_entry *ce, zval *object, int byref TSRMLS_DC );
+zend_object_iterator *resourcebundle_get_iterator( zend_class_entry *ce, zval *object, int byref );
 
 #endif // #ifndef RESOURCEBUNDLE_ITERATOR_H