first shot remove TSRMLS_* things

1 files changed, 12 insertions, 12 deletions

diff --git a/ext/intl/dateformat/dateformat_format.c b/ext/intl/dateformat/dateformat_format.c
index d11eb2df24..61c3627cb8 100644
--- a/ext/intl/dateformat/dateformat_format.c
+++ b/ext/intl/dateformat/dateformat_format.c
@@ -32,7 +32,7 @@
 /* {{{ 
  * Internal function which calls the udat_format
 */
-static void internal_format(IntlDateFormatter_object *dfo, UDate timestamp, zval *return_value TSRMLS_DC)
+static void internal_format(IntlDateFormatter_object *dfo, UDate timestamp, zval *return_value)
 {
 	UChar* 	formatted =  NULL;
 	int32_t	resultlengthneeded =0 ;
@@ -60,7 +60,7 @@ static void internal_format(IntlDateFormatter_object *dfo, UDate timestamp, zval
  * Internal function which fetches an element from the passed array for the key_name passed 
 */
 static int32_t internal_get_arr_ele(IntlDateFormatter_object *dfo,
-		HashTable* hash_arr, char* key_name, intl_error *err TSRMLS_DC)
+		HashTable* hash_arr, char* key_name, intl_error *err)
 {
 	zval	*ele_value	= NULL;
 	int32_t	result		= 0;
@@ -74,7 +74,7 @@ static int32_t internal_get_arr_ele(IntlDateFormatter_object *dfo,
 		if(Z_TYPE_P(ele_value) != IS_LONG) {
 			spprintf(&message, 0, "datefmt_format: parameter array contains "
 					"a non-integer element for key '%s'", key_name);
-			intl_errors_set(err, U_ILLEGAL_ARGUMENT_ERROR, message, 1 TSRMLS_CC);
+			intl_errors_set(err, U_ILLEGAL_ARGUMENT_ERROR, message, 1);
 			efree(message);
 		} else {
 			if (Z_LVAL_P(ele_value) > INT32_MAX ||
@@ -82,7 +82,7 @@ static int32_t internal_get_arr_ele(IntlDateFormatter_object *dfo,
 				spprintf(&message, 0, "datefmt_format: value %pd is out of "
 						"bounds for a 32-bit integer in key '%s'",
 						Z_LVAL_P(ele_value), key_name);
-				intl_errors_set(err, U_ILLEGAL_ARGUMENT_ERROR, message, 1 TSRMLS_CC);
+				intl_errors_set(err, U_ILLEGAL_ARGUMENT_ERROR, message, 1);
 				efree(message);
 			} else {
 				result = Z_LVAL_P(ele_value);
@@ -98,7 +98,7 @@ static int32_t internal_get_arr_ele(IntlDateFormatter_object *dfo,
  * Internal function which sets UCalendar  from the passed array and retrieves timestamp
 */
 static UDate internal_get_timestamp(IntlDateFormatter_object *dfo,
-		HashTable *hash_arr TSRMLS_DC)
+		HashTable *hash_arr)
 {
 	int32_t		year,
 				month,
@@ -111,7 +111,7 @@ static UDate internal_get_timestamp(IntlDateFormatter_object *dfo,
 	intl_error	*err = &dfo->datef_data.error;
 
 #define INTL_GET_ELEM(elem) \
-	internal_get_arr_ele(dfo, hash_arr, (elem), err TSRMLS_CC)
+	internal_get_arr_ele(dfo, hash_arr, (elem), err)
 
 	/* Fetch  values from the incoming array */
 	year	= INTL_GET_ELEM(CALENDAR_YEAR) + 1900; /* tm_year is years since 1900 */
@@ -130,7 +130,7 @@ static UDate internal_get_timestamp(IntlDateFormatter_object *dfo,
 
 	if (INTL_DATA_ERROR_CODE(dfo) != U_ZERO_ERROR) {
 		intl_errors_set(err, INTL_DATA_ERROR_CODE(dfo), "datefmt_format: "
-				"error cloning calendar", 0 TSRMLS_CC);
+				"error cloning calendar", 0);
 		return 0;
 	}
 
@@ -158,10 +158,10 @@ PHP_FUNCTION(datefmt_format)
 	DATE_FORMAT_METHOD_INIT_VARS;
 
 	/* Parse parameters. */
-	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oz",
+	if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Oz",
 			&object, IntlDateFormatter_ce_ptr, &zarg) == FAILURE) {
 		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "datefmt_format: unable "
-				"to parse input params", 0 TSRMLS_CC );
+				"to parse input params", 0 );
 		RETURN_FALSE;
 	}
 
@@ -173,17 +173,17 @@ PHP_FUNCTION(datefmt_format)
 			RETURN_FALSE;
 		}
 
-		timestamp = internal_get_timestamp(dfo, hash_arr TSRMLS_CC);
+		timestamp = internal_get_timestamp(dfo, hash_arr);
 		INTL_METHOD_CHECK_STATUS(dfo, "datefmt_format: date formatting failed")
 	} else {
 		timestamp = intl_zval_to_millis(zarg, INTL_DATA_ERROR_P(dfo),
-				"datefmt_format" TSRMLS_CC);
+				"datefmt_format");
 		if (U_FAILURE(INTL_DATA_ERROR_CODE(dfo))) {
 			RETURN_FALSE;
 		}
 	}
 	
-	internal_format( dfo, timestamp, return_value TSRMLS_CC);
+	internal_format( dfo, timestamp, return_value);
 }
 
 /* }}} */