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

5 files changed, 77 insertions, 77 deletions

diff --git a/ext/intl/common/common_date.cpp b/ext/intl/common/common_date.cpp
index 23dc342080..326e8c01c9 100644
--- a/ext/intl/common/common_date.cpp
+++ b/ext/intl/common/common_date.cpp
@@ -39,7 +39,7 @@ U_CFUNC TimeZone *timezone_convert_datetimezone(int type,
 												void *object,
 												int is_datetime,
 												intl_error *outside_error,
-												const char *func TSRMLS_DC)
+												const char *func)
 {
 	char		*id = NULL,
 				offset_id[] = "GMT+00:00";
@@ -66,7 +66,7 @@ U_CFUNC TimeZone *timezone_convert_datetimezone(int type,
 				spprintf(&message, 0, "%s: object has an time zone offset "
 					"that's too large", func);
 				intl_errors_set(outside_error, U_ILLEGAL_ARGUMENT_ERROR,
-					message, 1 TSRMLS_CC);
+					message, 1);
 				efree(message);
 				return NULL;
 			}
@@ -97,7 +97,7 @@ U_CFUNC TimeZone *timezone_convert_datetimezone(int type,
 		spprintf(&message, 0, "%s: time zone id '%s' "
 			"extracted from ext/date DateTimeZone not recognized", func, id);
 		intl_errors_set(outside_error, U_ILLEGAL_ARGUMENT_ERROR,
-			message, 1 TSRMLS_CC);
+			message, 1);
 		efree(message);
 		delete timeZone;
 		return NULL;
@@ -107,7 +107,7 @@ U_CFUNC TimeZone *timezone_convert_datetimezone(int type,
 /* }}} */
 
 U_CFUNC int intl_datetime_decompose(zval *z, double *millis, TimeZone **tz,
-		intl_error *err, const char *func TSRMLS_DC)
+		intl_error *err, const char *func)
 {
 	zval	retval;
 	zval	zfuncname;
@@ -126,12 +126,12 @@ U_CFUNC int intl_datetime_decompose(zval *z, double *millis, TimeZone **tz,
 
 	if (millis) {
 		ZVAL_STRING(&zfuncname, "getTimestamp");
-		if (call_user_function(NULL, z, &zfuncname, &retval, 0, NULL TSRMLS_CC)
+		if (call_user_function(NULL, z, &zfuncname, &retval, 0, NULL)
 				!= SUCCESS || Z_TYPE(retval) != IS_LONG) {
 			spprintf(&message, 0, "%s: error calling ::getTimeStamp() on the "
 					"object", func);
 			intl_errors_set(err, U_INTERNAL_PROGRAM_ERROR,
-				message, 1 TSRMLS_CC);
+				message, 1);
 			efree(message);
 			zval_ptr_dtor(&zfuncname);
 			return FAILURE;
@@ -148,7 +148,7 @@ U_CFUNC int intl_datetime_decompose(zval *z, double *millis, TimeZone **tz,
 			spprintf(&message, 0, "%s: the DateTime object is not properly "
 					"initialized", func);
 			intl_errors_set(err, U_ILLEGAL_ARGUMENT_ERROR,
-				message, 1 TSRMLS_CC);
+				message, 1);
 			efree(message);
 			return FAILURE;
 		}
@@ -156,12 +156,12 @@ U_CFUNC int intl_datetime_decompose(zval *z, double *millis, TimeZone **tz,
 			*tz = TimeZone::getGMT()->clone();
 		} else {
 			*tz = timezone_convert_datetimezone(datetime->time->zone_type,
-				datetime, 1, NULL, func TSRMLS_CC);
+				datetime, 1, NULL, func);
 			if (*tz == NULL) {
 				spprintf(&message, 0, "%s: could not convert DateTime's "
 						"time zone", func);
 				intl_errors_set(err, U_ILLEGAL_ARGUMENT_ERROR,
-					message, 1 TSRMLS_CC);
+					message, 1);
 				efree(message);
 				return FAILURE;
 			}
@@ -171,7 +171,7 @@ U_CFUNC int intl_datetime_decompose(zval *z, double *millis, TimeZone **tz,
 	return SUCCESS;
 }
 
-U_CFUNC double intl_zval_to_millis(zval *z, intl_error *err, const char *func TSRMLS_DC)
+U_CFUNC double intl_zval_to_millis(zval *z, intl_error *err, const char *func)
 {
 	double	rv = NAN;
 	zend_long	lv;
@@ -194,7 +194,7 @@ U_CFUNC double intl_zval_to_millis(zval *z, intl_error *err, const char *func TS
 					"which would be required for it to be a valid date", func,
 					Z_STRVAL_P(z));
 			intl_errors_set(err, U_ILLEGAL_ARGUMENT_ERROR,
-				message, 1 TSRMLS_CC);
+				message, 1);
 			efree(message);
 		}
 		break;
@@ -205,15 +205,15 @@ U_CFUNC double intl_zval_to_millis(zval *z, intl_error *err, const char *func TS
 		rv = U_MILLIS_PER_SECOND * Z_DVAL_P(z);
 		break;
 	case IS_OBJECT:
-		if (instanceof_function(Z_OBJCE_P(z), php_date_get_date_ce() TSRMLS_CC)) {
-			intl_datetime_decompose(z, &rv, NULL, err, func TSRMLS_CC);
-		} else if (instanceof_function(Z_OBJCE_P(z), Calendar_ce_ptr TSRMLS_CC)) {
+		if (instanceof_function(Z_OBJCE_P(z), php_date_get_date_ce())) {
+			intl_datetime_decompose(z, &rv, NULL, err, func);
+		} else if (instanceof_function(Z_OBJCE_P(z), Calendar_ce_ptr)) {
 			Calendar_object *co = Z_INTL_CALENDAR_P(z);
 			if (co->ucal == NULL) {
 				spprintf(&message, 0, "%s: IntlCalendar object is not properly "
 						"constructed", func);
 				intl_errors_set(err, U_ILLEGAL_ARGUMENT_ERROR,
-					message, 1 TSRMLS_CC);
+					message, 1);
 				efree(message);
 			} else {
 				UErrorCode status = UErrorCode();
@@ -221,7 +221,7 @@ U_CFUNC double intl_zval_to_millis(zval *z, intl_error *err, const char *func TS
 				if (U_FAILURE(status)) {
 					spprintf(&message, 0, "%s: call to internal "
 							"Calendar::getTime() has failed", func);
-					intl_errors_set(err, status, message, 1 TSRMLS_CC);
+					intl_errors_set(err, status, message, 1);
 					efree(message);
 				}
 			}
@@ -230,14 +230,14 @@ U_CFUNC double intl_zval_to_millis(zval *z, intl_error *err, const char *func TS
 			spprintf(&message, 0, "%s: invalid object type for date/time "
 					"(only IntlCalendar and DateTime permitted)", func);
 			intl_errors_set(err, U_ILLEGAL_ARGUMENT_ERROR,
-				message, 1 TSRMLS_CC);
+				message, 1);
 			efree(message);
 		}
 		break;
 	default:
 		spprintf(&message, 0, "%s: invalid PHP type for date", func);
 		intl_errors_set(err, U_ILLEGAL_ARGUMENT_ERROR,
-			message, 1 TSRMLS_CC);
+			message, 1);
 		efree(message);
 		break;
 	}
diff --git a/ext/intl/common/common_date.h b/ext/intl/common/common_date.h
index e8ab66f40d..d6b7c20719 100644
--- a/ext/intl/common/common_date.h
+++ b/ext/intl/common/common_date.h
@@ -28,13 +28,13 @@ U_CDECL_END
 
 #include <unicode/timezone.h>
 
-U_CFUNC TimeZone *timezone_convert_datetimezone(int type, void *object, int is_datetime, intl_error *outside_error, const char *func TSRMLS_DC);
+U_CFUNC TimeZone *timezone_convert_datetimezone(int type, void *object, int is_datetime, intl_error *outside_error, const char *func);
 U_CFUNC int intl_datetime_decompose(zval *z, double *millis, TimeZone **tz,
-		intl_error *err, const char *func TSRMLS_DC);
+		intl_error *err, const char *func);
 
 #endif
 
-U_CFUNC double intl_zval_to_millis(zval *z, intl_error *err, const char *func TSRMLS_DC);
+U_CFUNC double intl_zval_to_millis(zval *z, intl_error *err, const char *func);
 
 #endif	/* COMMON_DATE_H */
 
diff --git a/ext/intl/common/common_enum.cpp b/ext/intl/common/common_enum.cpp
index 952b39edca..cea9dc71c5 100644
--- a/ext/intl/common/common_enum.cpp
+++ b/ext/intl/common/common_enum.cpp
@@ -33,7 +33,7 @@ extern "C" {
 zend_class_entry *IntlIterator_ce_ptr;
 zend_object_handlers IntlIterator_handlers;
 
-void zoi_with_current_dtor(zend_object_iterator *iter TSRMLS_DC)
+void zoi_with_current_dtor(zend_object_iterator *iter)
 {
 	zoi_with_current *zoiwc = (zoi_with_current*)iter;
 	
@@ -52,22 +52,22 @@ void zoi_with_current_dtor(zend_object_iterator *iter TSRMLS_DC)
 		 * precedes the object free phase. Therefore there's no risk on this
 		 * function being called by the iterator wrapper destructor function and
 		 * not finding the memory of this iterator allocated anymore. */
-		iter->funcs->invalidate_current(iter TSRMLS_CC);
-		zoiwc->destroy_it(iter TSRMLS_CC);
+		iter->funcs->invalidate_current(iter);
+		zoiwc->destroy_it(iter);
 	}
 }
 
-U_CFUNC int zoi_with_current_valid(zend_object_iterator *iter TSRMLS_DC)
+U_CFUNC int zoi_with_current_valid(zend_object_iterator *iter)
 {
 	return Z_ISUNDEF(((zoi_with_current*)iter)->current)? FAILURE : SUCCESS;
 }
 
-U_CFUNC zval *zoi_with_current_get_current_data(zend_object_iterator *iter TSRMLS_DC)
+U_CFUNC zval *zoi_with_current_get_current_data(zend_object_iterator *iter)
 {
 	return &((zoi_with_current*)iter)->current;
 }
 
-U_CFUNC void zoi_with_current_invalidate_current(zend_object_iterator *iter TSRMLS_DC)
+U_CFUNC void zoi_with_current_invalidate_current(zend_object_iterator *iter)
 {
 	zoi_with_current *zoi_iter = (zoi_with_current*)iter;
 	if (!Z_ISUNDEF(zoi_iter->current)) {
@@ -76,12 +76,12 @@ U_CFUNC void zoi_with_current_invalidate_current(zend_object_iterator *iter TSRM
 	}
 }
 
-static void string_enum_current_move_forward(zend_object_iterator *iter TSRMLS_DC)
+static void string_enum_current_move_forward(zend_object_iterator *iter)
 {
 	zoi_with_current *zoi_iter = (zoi_with_current*)iter;
 	INTLITERATOR_METHOD_INIT_VARS;
 
-	iter->funcs->invalidate_current(iter TSRMLS_CC);
+	iter->funcs->invalidate_current(iter);
 
 	object = &zoi_iter->wrapping_obj;
 	INTLITERATOR_METHOD_FETCH_OBJECT_NO_CHECK;
@@ -90,22 +90,22 @@ static void string_enum_current_move_forward(zend_object_iterator *iter TSRMLS_D
 	const char *result = ((StringEnumeration*)Z_PTR(iter->data))->next(
 		&result_length, INTLITERATOR_ERROR_CODE(ii));
 
-	intl_error_set_code(NULL, INTLITERATOR_ERROR_CODE(ii) TSRMLS_CC);
+	intl_error_set_code(NULL, INTLITERATOR_ERROR_CODE(ii));
 	if (U_FAILURE(INTLITERATOR_ERROR_CODE(ii))) {
 		intl_errors_set_custom_msg(INTL_DATA_ERROR_P(ii),
-			"Error fetching next iteration element", 0 TSRMLS_CC);
+			"Error fetching next iteration element", 0);
 	} else if (result) {
 		ZVAL_STRINGL(&zoi_iter->current, result, result_length);
 	} //else we've reached the end of the enum, nothing more is required
 }
 
-static void string_enum_rewind(zend_object_iterator *iter TSRMLS_DC)
+static void string_enum_rewind(zend_object_iterator *iter)
 {
 	zoi_with_current *zoi_iter = (zoi_with_current*)iter;
 	INTLITERATOR_METHOD_INIT_VARS;
 
 	if (!Z_ISUNDEF(zoi_iter->current)) {
-		iter->funcs->invalidate_current(iter TSRMLS_CC);
+		iter->funcs->invalidate_current(iter);
 	}
 
 	object = &zoi_iter->wrapping_obj;
@@ -113,16 +113,16 @@ static void string_enum_rewind(zend_object_iterator *iter TSRMLS_DC)
 
 	((StringEnumeration*)Z_PTR(iter->data))->reset(INTLITERATOR_ERROR_CODE(ii));
 
-	intl_error_set_code(NULL, INTLITERATOR_ERROR_CODE(ii) TSRMLS_CC);
+	intl_error_set_code(NULL, INTLITERATOR_ERROR_CODE(ii));
 	if (U_FAILURE(INTLITERATOR_ERROR_CODE(ii))) {
 		intl_errors_set_custom_msg(INTL_DATA_ERROR_P(ii),
-			"Error resetting enumeration", 0 TSRMLS_CC);
+			"Error resetting enumeration", 0);
 	} else {
-		iter->funcs->move_forward(iter TSRMLS_CC);
+		iter->funcs->move_forward(iter);
 	}
 }
 
-static void string_enum_destroy_it(zend_object_iterator *iter TSRMLS_DC)
+static void string_enum_destroy_it(zend_object_iterator *iter)
 {
 	delete (StringEnumeration*)Z_PTR(iter->data);
 }
@@ -137,13 +137,13 @@ static zend_object_iterator_funcs string_enum_object_iterator_funcs = {
 	zoi_with_current_invalidate_current
 };
 
-U_CFUNC void IntlIterator_from_StringEnumeration(StringEnumeration *se, zval *object TSRMLS_DC)
+U_CFUNC void IntlIterator_from_StringEnumeration(StringEnumeration *se, zval *object)
 {
 	IntlIterator_object *ii;
 	object_init_ex(object, IntlIterator_ce_ptr);
 	ii = Z_INTL_ITERATOR_P(object);
 	ii->iterator = (zend_object_iterator*)emalloc(sizeof(zoi_with_current));
-	zend_iterator_init(ii->iterator TSRMLS_CC);
+	zend_iterator_init(ii->iterator);
 	ZVAL_PTR(&ii->iterator->data, se);
 	ii->iterator->funcs = &string_enum_object_iterator_funcs;
 	ii->iterator->index = 0;
@@ -152,26 +152,26 @@ U_CFUNC void IntlIterator_from_StringEnumeration(StringEnumeration *se, zval *ob
 	ZVAL_UNDEF(&((zoi_with_current*)ii->iterator)->current);
 }
 
-static void IntlIterator_objects_free(zend_object *object TSRMLS_DC)
+static void IntlIterator_objects_free(zend_object *object)
 {
 	IntlIterator_object	*ii = php_intl_iterator_fetch_object(object);
 
 	if (ii->iterator) {
 		zval *wrapping_objp = &((zoi_with_current*)ii->iterator)->wrapping_obj;
 		ZVAL_UNDEF(wrapping_objp);
-		zend_iterator_dtor(ii->iterator TSRMLS_CC);
+		zend_iterator_dtor(ii->iterator);
 	}
-	intl_error_reset(INTLITERATOR_ERROR_P(ii) TSRMLS_CC);
+	intl_error_reset(INTLITERATOR_ERROR_P(ii));
 
-	zend_object_std_dtor(&ii->zo TSRMLS_CC);
+	zend_object_std_dtor(&ii->zo);
 }
 
 static zend_object_iterator *IntlIterator_get_iterator(
-	zend_class_entry *ce, zval *object, int by_ref TSRMLS_DC)
+	zend_class_entry *ce, zval *object, int by_ref)
 {
 	if (by_ref) {
 		zend_throw_exception(NULL,
-			"Iteration by reference is not supported", 0 TSRMLS_CC);
+			"Iteration by reference is not supported", 0);
 		return NULL;
 	}
 
@@ -179,7 +179,7 @@ static zend_object_iterator *IntlIterator_get_iterator(
 
 	if (ii->iterator == NULL) {
 		zend_throw_exception(NULL,
-			"The IntlIterator is not properly constructed", 0 TSRMLS_CC);
+			"The IntlIterator is not properly constructed", 0);
 		return NULL;
 	}
 
@@ -188,15 +188,15 @@ static zend_object_iterator *IntlIterator_get_iterator(
 	return ii->iterator;
 }
 
-static zend_object *IntlIterator_object_create(zend_class_entry *ce TSRMLS_DC)
+static zend_object *IntlIterator_object_create(zend_class_entry *ce)
 {
 	IntlIterator_object	*intern;
 
 	intern = (IntlIterator_object*)ecalloc(1, sizeof(IntlIterator_object) + sizeof(zval) * (ce->default_properties_count - 1));
 	
-	zend_object_std_init(&intern->zo, ce TSRMLS_CC);
+	zend_object_std_init(&intern->zo, ce);
     object_properties_init(&intern->zo, ce);
-	intl_error_init(INTLITERATOR_ERROR_P(intern) TSRMLS_CC);
+	intl_error_init(INTLITERATOR_ERROR_P(intern));
 
 	intern->iterator = NULL;
 
@@ -212,12 +212,12 @@ static PHP_METHOD(IntlIterator, current)
 
 	if (zend_parse_parameters_none() == FAILURE) {
 		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-			"IntlIterator::current: bad arguments", 0 TSRMLS_CC);
+			"IntlIterator::current: bad arguments", 0);
 		return;
 	}
 
 	INTLITERATOR_METHOD_FETCH_OBJECT;
-	data = ii->iterator->funcs->get_current_data(ii->iterator TSRMLS_CC);
+	data = ii->iterator->funcs->get_current_data(ii->iterator);
 	if (data) {
 		RETURN_ZVAL(data, 1, 0);
 	}
@@ -229,14 +229,14 @@ static PHP_METHOD(IntlIterator, key)
 
 	if (zend_parse_parameters_none() == FAILURE) {
 		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-			"IntlIterator::key: bad arguments", 0 TSRMLS_CC);
+			"IntlIterator::key: bad arguments", 0);
 		return;
 	}
 
 	INTLITERATOR_METHOD_FETCH_OBJECT;
 
 	if (ii->iterator->funcs->get_current_key) {
-		ii->iterator->funcs->get_current_key(ii->iterator, return_value TSRMLS_CC);
+		ii->iterator->funcs->get_current_key(ii->iterator, return_value);
 	} else {
 		RETURN_LONG(ii->iterator->index);
 	}
@@ -248,12 +248,12 @@ static PHP_METHOD(IntlIterator, next)
 
 	if (zend_parse_parameters_none() == FAILURE) {
 		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-			"IntlIterator::next: bad arguments", 0 TSRMLS_CC);
+			"IntlIterator::next: bad arguments", 0);
 		return;
 	}
 
 	INTLITERATOR_METHOD_FETCH_OBJECT;
-	ii->iterator->funcs->move_forward(ii->iterator TSRMLS_CC);
+	ii->iterator->funcs->move_forward(ii->iterator);
 	/* foreach also advances the index after the last iteration,
 	 * so I see no problem in incrementing the index here unconditionally */
 	ii->iterator->index++;
@@ -265,16 +265,16 @@ static PHP_METHOD(IntlIterator, rewind)
 
 	if (zend_parse_parameters_none() == FAILURE) {
 		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-			"IntlIterator::rewind: bad arguments", 0 TSRMLS_CC);
+			"IntlIterator::rewind: bad arguments", 0);
 		return;
 	}
 
 	INTLITERATOR_METHOD_FETCH_OBJECT;
 	if (ii->iterator->funcs->rewind) {
-		ii->iterator->funcs->rewind(ii->iterator TSRMLS_CC);
+		ii->iterator->funcs->rewind(ii->iterator);
 	} else {
 		intl_errors_set(INTLITERATOR_ERROR_P(ii), U_UNSUPPORTED_ERROR,
-			"IntlIterator::rewind: rewind not supported", 0 TSRMLS_CC);
+			"IntlIterator::rewind: rewind not supported", 0);
 	}
 }
 
@@ -284,12 +284,12 @@ static PHP_METHOD(IntlIterator, valid)
 
 	if (zend_parse_parameters_none() == FAILURE) {
 		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-			"IntlIterator::valid: bad arguments", 0 TSRMLS_CC);
+			"IntlIterator::valid: bad arguments", 0);
 		return;
 	}
 
 	INTLITERATOR_METHOD_FETCH_OBJECT;
-	RETURN_BOOL(ii->iterator->funcs->valid(ii->iterator TSRMLS_CC) == SUCCESS);
+	RETURN_BOOL(ii->iterator->funcs->valid(ii->iterator) == SUCCESS);
 }
 
 ZEND_BEGIN_ARG_INFO_EX(ainfo_se_void, 0, 0, 0)
@@ -308,16 +308,16 @@ static zend_function_entry IntlIterator_class_functions[] = {
 /* {{{ intl_register_IntlIterator_class
  * Initialize 'IntlIterator' class
  */
-U_CFUNC void intl_register_IntlIterator_class(TSRMLS_D)
+U_CFUNC void intl_register_IntlIterator_class(void)
 {
 	zend_class_entry ce;
 
 	/* Create and register 'IntlIterator' class. */
 	INIT_CLASS_ENTRY(ce, "IntlIterator", IntlIterator_class_functions);
 	ce.create_object = IntlIterator_object_create;
-	IntlIterator_ce_ptr = zend_register_internal_class(&ce TSRMLS_CC);
+	IntlIterator_ce_ptr = zend_register_internal_class(&ce);
 	IntlIterator_ce_ptr->get_iterator = IntlIterator_get_iterator;
-	zend_class_implements(IntlIterator_ce_ptr TSRMLS_CC, 1,
+	zend_class_implements(IntlIterator_ce_ptr, 1,
 		zend_ce_iterator);
 
 	memcpy(&IntlIterator_handlers, zend_get_std_object_handlers(),
diff --git a/ext/intl/common/common_enum.h b/ext/intl/common/common_enum.h
index af46a47751..b9b87c17e0 100644
--- a/ext/intl/common/common_enum.h
+++ b/ext/intl/common/common_enum.h
@@ -43,7 +43,7 @@ extern "C" {
 	object = getThis(); \
 	INTLITERATOR_METHOD_FETCH_OBJECT_NO_CHECK; \
 	if (ii->iterator == NULL) { \
-		intl_errors_set(&ii->err, U_ILLEGAL_ARGUMENT_ERROR, "Found unconstructed IntlIterator", 0 TSRMLS_CC); \
+		intl_errors_set(&ii->err, U_ILLEGAL_ARGUMENT_ERROR, "Found unconstructed IntlIterator", 0); \
 		RETURN_FALSE; \
 	}
 
@@ -63,21 +63,21 @@ typedef struct {
 	zend_object_iterator	zoi;
 	zval					current;
 	zval					wrapping_obj;
-	void					(*destroy_it)(zend_object_iterator	*iterator TSRMLS_DC);
+	void					(*destroy_it)(zend_object_iterator	*iterator);
 } zoi_with_current;
 
 extern zend_class_entry *IntlIterator_ce_ptr;
 extern zend_object_handlers IntlIterator_handlers;
 
-U_CFUNC void zoi_with_current_dtor(zend_object_iterator *iter TSRMLS_DC);
-U_CFUNC int zoi_with_current_valid(zend_object_iterator *iter TSRMLS_DC);
-U_CFUNC zval *zoi_with_current_get_current_data(zend_object_iterator *iter TSRMLS_DC);
-U_CFUNC void zoi_with_current_invalidate_current(zend_object_iterator *iter TSRMLS_DC);
+U_CFUNC void zoi_with_current_dtor(zend_object_iterator *iter);
+U_CFUNC int zoi_with_current_valid(zend_object_iterator *iter);
+U_CFUNC zval *zoi_with_current_get_current_data(zend_object_iterator *iter);
+U_CFUNC void zoi_with_current_invalidate_current(zend_object_iterator *iter);
 
 #ifdef __cplusplus
-U_CFUNC void IntlIterator_from_StringEnumeration(StringEnumeration *se, zval *object TSRMLS_DC);
+U_CFUNC void IntlIterator_from_StringEnumeration(StringEnumeration *se, zval *object);
 #endif
 
-U_CFUNC void intl_register_IntlIterator_class(TSRMLS_D);
+U_CFUNC void intl_register_IntlIterator_class(void);
 
 #endif // INTL_COMMON_ENUM_H
diff --git a/ext/intl/common/common_error.c b/ext/intl/common/common_error.c
index 524bb94327..16933c587f 100644
--- a/ext/intl/common/common_error.c
+++ b/ext/intl/common/common_error.c
@@ -28,7 +28,7 @@
  */
 PHP_FUNCTION( intl_get_error_code )
 {
-	RETURN_LONG( intl_error_get_code( NULL TSRMLS_CC ) );
+	RETURN_LONG( intl_error_get_code( NULL ) );
 }
 /* }}} */
 
@@ -37,7 +37,7 @@ PHP_FUNCTION( intl_get_error_code )
  */
 PHP_FUNCTION( intl_get_error_message )
 {
-	RETURN_STR(intl_error_get_message( NULL TSRMLS_CC ));
+	RETURN_STR(intl_error_get_message( NULL ));
 }
 /* }}} */
 
@@ -51,11 +51,11 @@ PHP_FUNCTION( intl_is_failure )
 	zend_long err_code;
 
 	/* Parse parameters. */
-	if( zend_parse_parameters( ZEND_NUM_ARGS() TSRMLS_CC, "l",
+	if( zend_parse_parameters( ZEND_NUM_ARGS(), "l",
 		&err_code ) == FAILURE )
 	{
 		intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-			"intl_is_failure: unable to parse input params", 0 TSRMLS_CC );
+			"intl_is_failure: unable to parse input params", 0 );
 
 		RETURN_FALSE;
 	}
@@ -73,11 +73,11 @@ PHP_FUNCTION( intl_error_name )
 	zend_long err_code;
 
 	/* Parse parameters. */
-	if( zend_parse_parameters( ZEND_NUM_ARGS() TSRMLS_CC, "l",
+	if( zend_parse_parameters( ZEND_NUM_ARGS(), "l",
 		&err_code ) == FAILURE )
 	{
 		intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-			"intl_error_name: unable to parse input params", 0 TSRMLS_CC );
+			"intl_error_name: unable to parse input params", 0 );
 
 		RETURN_FALSE;
 	}