first shot remove TSRMLS_* things

1 files changed, 77 insertions, 77 deletions

diff --git a/ext/intl/timezone/timezone_methods.cpp b/ext/intl/timezone/timezone_methods.cpp
index 033b216cdf..98ae6f97aa 100644
--- a/ext/intl/timezone/timezone_methods.cpp
+++ b/ext/intl/timezone/timezone_methods.cpp
@@ -41,19 +41,19 @@ U_CFUNC PHP_METHOD(IntlTimeZone, __construct)
 {
 	zend_throw_exception( NULL,
 		"An object of this type cannot be created with the new operator",
-		0 TSRMLS_CC );
+		0 );
 }
 
 U_CFUNC PHP_FUNCTION(intltz_create_time_zone)
 {
 	char	*str_id;
 	size_t		str_id_len;
-	intl_error_reset(NULL TSRMLS_CC);
+	intl_error_reset(NULL);
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s",
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "s",
 			&str_id, &str_id_len) == FAILURE) {
 		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-			"intltz_create_time_zone: bad arguments", 0 TSRMLS_CC);
+			"intltz_create_time_zone: bad arguments", 0);
 		RETURN_NULL();
 	}
 
@@ -61,13 +61,13 @@ U_CFUNC PHP_FUNCTION(intltz_create_time_zone)
 	UnicodeString id = UnicodeString();
 	if (intl_stringFromChar(id, str_id, str_id_len, &status) == FAILURE) {
 		intl_error_set(NULL, status,
-			"intltz_create_time_zone: could not convert time zone id to UTF-16", 0 TSRMLS_CC);
+			"intltz_create_time_zone: could not convert time zone id to UTF-16", 0);
 		RETURN_NULL();
 	}
 
 	//guaranteed non-null; GMT if timezone cannot be understood
 	TimeZone *tz = TimeZone::createTimeZone(id);
-	timezone_object_construct(tz, return_value, 1 TSRMLS_CC);
+	timezone_object_construct(tz, return_value, 1);
 }
 
 U_CFUNC PHP_FUNCTION(intltz_from_date_time_zone)
@@ -75,12 +75,12 @@ U_CFUNC PHP_FUNCTION(intltz_from_date_time_zone)
 	zval				*zv_timezone;
 	TimeZone			*tz;
 	php_timezone_obj	*tzobj;
-	intl_error_reset(NULL TSRMLS_CC);
+	intl_error_reset(NULL);
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O",
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "O",
 			&zv_timezone, php_date_get_timezone_ce()) == FAILURE) {
 		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-			"intltz_from_date_time_zone: bad arguments", 0 TSRMLS_CC);
+			"intltz_from_date_time_zone: bad arguments", 0);
 		RETURN_NULL();
 	}
 
@@ -88,58 +88,58 @@ U_CFUNC PHP_FUNCTION(intltz_from_date_time_zone)
 	if (!tzobj->initialized) {
 		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
 			"intltz_from_date_time_zone: DateTimeZone object is unconstructed",
-			0 TSRMLS_CC);
+			0);
 		RETURN_NULL();
 	}
 
 	tz = timezone_convert_datetimezone(tzobj->type, tzobj, FALSE, NULL,
-		"intltz_from_date_time_zone" TSRMLS_CC);
+		"intltz_from_date_time_zone");
 	if (tz == NULL) {
 		RETURN_NULL();
 	}
 
-	timezone_object_construct(tz, return_value, 1 TSRMLS_CC);
+	timezone_object_construct(tz, return_value, 1);
 }
 
 U_CFUNC PHP_FUNCTION(intltz_create_default)
 {
-	intl_error_reset(NULL TSRMLS_CC);
+	intl_error_reset(NULL);
 
 	if (zend_parse_parameters_none() == FAILURE) {
 		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-			"intltz_create_default: bad arguments", 0 TSRMLS_CC);
+			"intltz_create_default: bad arguments", 0);
 		RETURN_NULL();
 	}
 
 	TimeZone *tz = TimeZone::createDefault();
-	timezone_object_construct(tz, return_value, 1 TSRMLS_CC);
+	timezone_object_construct(tz, return_value, 1);
 }
 
 U_CFUNC PHP_FUNCTION(intltz_get_gmt)
 {
-	intl_error_reset(NULL TSRMLS_CC);
+	intl_error_reset(NULL);
 
 	if (zend_parse_parameters_none() == FAILURE) {
 		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-			"intltz_get_gmt: bad arguments", 0 TSRMLS_CC);
+			"intltz_get_gmt: bad arguments", 0);
 		RETURN_NULL();
 	}
 
-	timezone_object_construct(TimeZone::getGMT(), return_value, 0 TSRMLS_CC);
+	timezone_object_construct(TimeZone::getGMT(), return_value, 0);
 }
 
 #if U_ICU_VERSION_MAJOR_NUM >= 49
 U_CFUNC PHP_FUNCTION(intltz_get_unknown)
 {
-	intl_error_reset(NULL TSRMLS_CC);
+	intl_error_reset(NULL);
 
 	if (zend_parse_parameters_none() == FAILURE) {
 		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-			"intltz_get_unknown: bad arguments", 0 TSRMLS_CC);
+			"intltz_get_unknown: bad arguments", 0);
 		RETURN_NULL();
 	}
 
-	timezone_object_construct(&TimeZone::getUnknown(), return_value, 0 TSRMLS_CC);
+	timezone_object_construct(&TimeZone::getUnknown(), return_value, 0);
 }
 #endif
 
@@ -147,13 +147,13 @@ U_CFUNC PHP_FUNCTION(intltz_create_enumeration)
 {
 	zval				*arg = NULL;
 	StringEnumeration	*se	  = NULL;
-	intl_error_reset(NULL TSRMLS_CC);
+	intl_error_reset(NULL);
 
 	/* double indirection to have the zend engine destroy the new zval that
 	 * results from separation */
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|z", &arg) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "|z", &arg) == FAILURE) {
 		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-			"intltz_create_enumeration: bad arguments", 0 TSRMLS_CC);
+			"intltz_create_enumeration: bad arguments", 0);
 		RETURN_FALSE;
 	}
 
@@ -164,7 +164,7 @@ int_offset:
 		if (Z_LVAL_P(arg) < (zend_long)INT32_MIN ||
 				Z_LVAL_P(arg) > (zend_long)INT32_MAX) {
 			intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-				"intltz_create_enumeration: value is out of range", 0 TSRMLS_CC);
+				"intltz_create_enumeration: value is out of range", 0);
 			RETURN_FALSE;
 		} else {
 			se = TimeZone::createEnumeration((int32_t) Z_LVAL_P(arg));
@@ -193,15 +193,15 @@ double_offset:
 		se = TimeZone::createEnumeration(Z_STRVAL_P(arg));
 	} else {
 		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-			"intltz_create_enumeration: invalid argument type", 0 TSRMLS_CC);
+			"intltz_create_enumeration: invalid argument type", 0);
 		RETURN_FALSE;
 	}
 
 	if (se) {
-		IntlIterator_from_StringEnumeration(se, return_value TSRMLS_CC);
+		IntlIterator_from_StringEnumeration(se, return_value);
 	} else {
 		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-			"intltz_create_enumeration: error obtaining enumeration", 0 TSRMLS_CC);
+			"intltz_create_enumeration: error obtaining enumeration", 0);
 		RETVAL_FALSE;
 	}
 }
@@ -210,12 +210,12 @@ U_CFUNC PHP_FUNCTION(intltz_count_equivalent_ids)
 {
 	char	*str_id;
 	size_t		str_id_len;
-	intl_error_reset(NULL TSRMLS_CC);
+	intl_error_reset(NULL);
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s",
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "s",
 			&str_id, &str_id_len) == FAILURE) {
 		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-			"intltz_count_equivalent_ids: bad arguments", 0 TSRMLS_CC);
+			"intltz_count_equivalent_ids: bad arguments", 0);
 		RETURN_FALSE;
 	}
 
@@ -223,7 +223,7 @@ U_CFUNC PHP_FUNCTION(intltz_count_equivalent_ids)
 	UnicodeString id = UnicodeString();
 	if (intl_stringFromChar(id, str_id, str_id_len, &status) == FAILURE) {
 		intl_error_set(NULL, status,
-			"intltz_count_equivalent_ids: could not convert time zone id to UTF-16", 0 TSRMLS_CC);
+			"intltz_count_equivalent_ids: could not convert time zone id to UTF-16", 0);
 		RETURN_FALSE;
 	}
 
@@ -241,7 +241,7 @@ U_CFUNC PHP_FUNCTION(intltz_create_time_zone_id_enumeration)
 	int32_t	offset,
 			*offsetp	= NULL;
 	int		arg3isnull	= 0;
-	intl_error_reset(NULL TSRMLS_CC);
+	intl_error_reset(NULL);
 
 	/* must come before zpp because zpp would convert the arg in the stack to 0 */
 	if (ZEND_NUM_ARGS() == 3) {
@@ -250,24 +250,24 @@ U_CFUNC PHP_FUNCTION(intltz_create_time_zone_id_enumeration)
 				!= FAILURE && Z_TYPE_P(zvoffset) == IS_NULL;
 	}
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l|s!l",
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "l|s!l",
 			&zoneType, &region, &region_len, &offset_arg) == FAILURE) {
 		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-			"intltz_create_time_zone_id_enumeration: bad arguments", 0 TSRMLS_CC);
+			"intltz_create_time_zone_id_enumeration: bad arguments", 0);
 		RETURN_FALSE;
 	}
 
 	if (zoneType != UCAL_ZONE_TYPE_ANY && zoneType != UCAL_ZONE_TYPE_CANONICAL
 			&& zoneType != UCAL_ZONE_TYPE_CANONICAL_LOCATION) {
 		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-			"intltz_create_time_zone_id_enumeration: bad zone type", 0 TSRMLS_CC);
+			"intltz_create_time_zone_id_enumeration: bad zone type", 0);
 		RETURN_FALSE;
 	}
 
 	if (ZEND_NUM_ARGS() == 3) {
 		if (offset_arg < (zend_long)INT32_MIN || offset_arg > (zend_long)INT32_MAX) {
 			intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-				"intltz_create_time_zone_id_enumeration: offset out of bounds", 0 TSRMLS_CC);
+				"intltz_create_time_zone_id_enumeration: offset out of bounds", 0);
 			RETURN_FALSE;
 		}
 		
@@ -284,7 +284,7 @@ U_CFUNC PHP_FUNCTION(intltz_create_time_zone_id_enumeration)
 	INTL_CHECK_STATUS(uec, "intltz_create_time_zone_id_enumeration: "
 		"Error obtaining time zone id enumeration")
 
-	IntlIterator_from_StringEnumeration(se, return_value TSRMLS_CC);
+	IntlIterator_from_StringEnumeration(se, return_value);
 }
 #endif
 
@@ -293,12 +293,12 @@ U_CFUNC PHP_FUNCTION(intltz_get_canonical_id)
 	char	*str_id;
 	size_t		str_id_len;
 	zval	*is_systemid = NULL;
-	intl_error_reset(NULL TSRMLS_CC);
+	intl_error_reset(NULL);
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|z",
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|z",
 			&str_id, &str_id_len, &is_systemid) == FAILURE) {
 		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-			"intltz_get_canonical_id: bad arguments", 0 TSRMLS_CC);
+			"intltz_get_canonical_id: bad arguments", 0);
 		RETURN_FALSE;
 	}
 
@@ -306,7 +306,7 @@ U_CFUNC PHP_FUNCTION(intltz_get_canonical_id)
 	UnicodeString id;
 	if (intl_stringFromChar(id, str_id, str_id_len, &status) == FAILURE) {
 		intl_error_set(NULL, status,
-			"intltz_get_canonical_id: could not convert time zone id to UTF-16", 0 TSRMLS_CC);
+			"intltz_get_canonical_id: could not convert time zone id to UTF-16", 0);
 		RETURN_FALSE;
 	}
 
@@ -337,12 +337,12 @@ U_CFUNC PHP_FUNCTION(intltz_get_region)
 	char	*str_id;
 	size_t		str_id_len;
 	char	outbuf[3];
-	intl_error_reset(NULL TSRMLS_CC);
+	intl_error_reset(NULL);
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s",
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "s",
 			&str_id, &str_id_len) == FAILURE) {
 		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-			"intltz_get_region: bad arguments", 0 TSRMLS_CC);
+			"intltz_get_region: bad arguments", 0);
 		RETURN_FALSE;
 	}
 
@@ -350,7 +350,7 @@ U_CFUNC PHP_FUNCTION(intltz_get_region)
 	UnicodeString id;
 	if (intl_stringFromChar(id, str_id, str_id_len, &status) == FAILURE) {
 		intl_error_set(NULL, status,
-			"intltz_get_region: could not convert time zone id to UTF-16", 0 TSRMLS_CC);
+			"intltz_get_region: could not convert time zone id to UTF-16", 0);
 		RETURN_FALSE;
 	}
 
@@ -363,11 +363,11 @@ U_CFUNC PHP_FUNCTION(intltz_get_region)
 
 U_CFUNC PHP_FUNCTION(intltz_get_tz_data_version)
 {
-	intl_error_reset(NULL TSRMLS_CC);
+	intl_error_reset(NULL);
 
 	if (zend_parse_parameters_none() == FAILURE) {
 		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-			"intltz_get_tz_data_version: bad arguments", 0 TSRMLS_CC);
+			"intltz_get_tz_data_version: bad arguments", 0);
 		RETURN_FALSE;
 	}
 
@@ -384,13 +384,13 @@ U_CFUNC PHP_FUNCTION(intltz_get_equivalent_id)
 	char	*str_id;
 	size_t		str_id_len;
 	zend_long	index;
-	intl_error_reset(NULL TSRMLS_CC);
+	intl_error_reset(NULL);
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sl",
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "sl",
 			&str_id, &str_id_len, &index) == FAILURE ||
 			index < (zend_long)INT32_MIN || index > (zend_long)INT32_MAX) {
 		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-			"intltz_get_equivalent_id: bad arguments", 0 TSRMLS_CC);
+			"intltz_get_equivalent_id: bad arguments", 0);
 		RETURN_FALSE;
 	}
 
@@ -398,7 +398,7 @@ U_CFUNC PHP_FUNCTION(intltz_get_equivalent_id)
 	UnicodeString id;
 	if (intl_stringFromChar(id, str_id, str_id_len, &status) == FAILURE) {
 		intl_error_set(NULL, status,
-			"intltz_get_equivalent_id: could not convert time zone id to UTF-16", 0 TSRMLS_CC);
+			"intltz_get_equivalent_id: could not convert time zone id to UTF-16", 0);
 		RETURN_FALSE;
 	}
 
@@ -418,10 +418,10 @@ U_CFUNC PHP_FUNCTION(intltz_get_id)
 {
 	TIMEZONE_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, TimeZone_ce_ptr) == FAILURE) {
 		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-			"intltz_get_id: bad arguments", 0 TSRMLS_CC);
+			"intltz_get_id: bad arguments", 0);
 		RETURN_FALSE;
 	}
 
@@ -446,10 +446,10 @@ U_CFUNC PHP_FUNCTION(intltz_use_daylight_time)
 {
 	TIMEZONE_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, TimeZone_ce_ptr) == FAILURE) {
 		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-			"intltz_use_daylight_time: bad arguments", 0 TSRMLS_CC);
+			"intltz_use_daylight_time: bad arguments", 0);
 		RETURN_FALSE;
 	}
 
@@ -468,11 +468,11 @@ U_CFUNC PHP_FUNCTION(intltz_get_offset)
 				dstOffset;
 	TIMEZONE_METHOD_INIT_VARS;
 
-	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
+	if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
 			"Odbz/z/", &object, TimeZone_ce_ptr, &date, &local, &rawOffsetArg,
 			&dstOffsetArg) == FAILURE) {
 		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-			"intltz_get_offset: bad arguments", 0 TSRMLS_CC);
+			"intltz_get_offset: bad arguments", 0);
 		RETURN_FALSE;
 	}
 
@@ -497,10 +497,10 @@ U_CFUNC PHP_FUNCTION(intltz_get_raw_offset)
 {
 	TIMEZONE_METHOD_INIT_VARS;
 
-	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
+	if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
 			"O", &object, TimeZone_ce_ptr) == FAILURE) {
 		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-			"intltz_get_raw_offset: bad arguments", 0 TSRMLS_CC);
+			"intltz_get_raw_offset: bad arguments", 0);
 		RETURN_FALSE;
 	}
 
@@ -515,18 +515,18 @@ U_CFUNC PHP_FUNCTION(intltz_has_same_rules)
 	TimeZone_object	*other_to;
 	TIMEZONE_METHOD_INIT_VARS;
 
-	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
+	if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
 			"OO", &object, TimeZone_ce_ptr, &other_object, TimeZone_ce_ptr)
 			== FAILURE) {
 		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-			"intltz_has_same_rules: bad arguments", 0 TSRMLS_CC);
+			"intltz_has_same_rules: bad arguments", 0);
 		RETURN_FALSE;
 	}
 	TIMEZONE_METHOD_FETCH_OBJECT;
 	other_to = Z_INTL_TIMEZONE_P(other_object);
 	if (other_to->utimezone == NULL) {
 		intl_errors_set(&to->err, U_ILLEGAL_ARGUMENT_ERROR,
-			"intltz_has_same_rules: The second IntlTimeZone is unconstructed", 0 TSRMLS_CC);
+			"intltz_has_same_rules: The second IntlTimeZone is unconstructed", 0);
 		RETURN_FALSE;
 	}
 
@@ -550,11 +550,11 @@ U_CFUNC PHP_FUNCTION(intltz_get_display_name)
 	size_t			dummy			= 0;
 	TIMEZONE_METHOD_INIT_VARS;
 
-	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
+	if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
 			"O|bls!", &object, TimeZone_ce_ptr, &daylight, &display_type,
 			&locale_str, &dummy) == FAILURE) {
 		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-			"intltz_get_display_name: bad arguments", 0 TSRMLS_CC);
+			"intltz_get_display_name: bad arguments", 0);
 		RETURN_FALSE;
 	}
 
@@ -565,12 +565,12 @@ U_CFUNC PHP_FUNCTION(intltz_get_display_name)
 	}
 	if (!found) {
 		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-			"intltz_get_display_name: wrong display type", 0 TSRMLS_CC);
+			"intltz_get_display_name: wrong display type", 0);
 		RETURN_FALSE;
 	}
 
 	if (!locale_str) {
-		locale_str = intl_locale_get_default(TSRMLS_C);
+		locale_str = intl_locale_get_default();
 	}
 
 	TIMEZONE_METHOD_FETCH_OBJECT;
@@ -594,10 +594,10 @@ U_CFUNC PHP_FUNCTION(intltz_get_dst_savings)
 {
 	TIMEZONE_METHOD_INIT_VARS;
 
-	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
+	if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
 			"O", &object, TimeZone_ce_ptr) == FAILURE) {
 		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-			"intltz_get_dst_savings: bad arguments", 0 TSRMLS_CC);
+			"intltz_get_dst_savings: bad arguments", 0);
 		RETURN_FALSE;
 	}
 
@@ -611,17 +611,17 @@ U_CFUNC PHP_FUNCTION(intltz_to_date_time_zone)
 	zval tmp;
 	TIMEZONE_METHOD_INIT_VARS;
 
-	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
+	if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
 			"O", &object, TimeZone_ce_ptr) == FAILURE) {
 		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-			"intltz_to_date_time_zone: bad arguments", 0 TSRMLS_CC);
+			"intltz_to_date_time_zone: bad arguments", 0);
 		RETURN_FALSE;
 	}
 
 	TIMEZONE_METHOD_FETCH_OBJECT;
 
 	zval *ret = timezone_convert_to_datetimezone(to->utimezone,
-		&TIMEZONE_ERROR(to), "intltz_to_date_time_zone", &tmp TSRMLS_CC);
+		&TIMEZONE_ERROR(to), "intltz_to_date_time_zone", &tmp);
 
 	if (ret) {
 		RETURN_ZVAL(ret, 1, 1);
@@ -634,10 +634,10 @@ U_CFUNC PHP_FUNCTION(intltz_get_error_code)
 {
 	TIMEZONE_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, TimeZone_ce_ptr) == FAILURE) {
 		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-			"intltz_get_error_code: bad arguments", 0 TSRMLS_CC);
+			"intltz_get_error_code: bad arguments", 0);
 		RETURN_FALSE;
 	}
 
@@ -654,10 +654,10 @@ U_CFUNC PHP_FUNCTION(intltz_get_error_message)
 	zend_string* message = NULL;
 	TIMEZONE_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, TimeZone_ce_ptr) == FAILURE) {
 		intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-			"intltz_get_error_message: bad arguments", 0 TSRMLS_CC );
+			"intltz_get_error_message: bad arguments", 0 );
 		RETURN_FALSE;
 	}
 
@@ -668,6 +668,6 @@ U_CFUNC PHP_FUNCTION(intltz_get_error_message)
 		RETURN_FALSE;
 
 	/* Return last error message. */
-	message = intl_error_get_message(TIMEZONE_ERROR_P(to) TSRMLS_CC);
+	message = intl_error_get_message(TIMEZONE_ERROR_P(to));
 	RETURN_STR(message);
 }