first shot remove TSRMLS_* things

1 files changed, 16 insertions, 16 deletions

diff --git a/ext/intl/dateformat/dateformat_class.c b/ext/intl/dateformat/dateformat_class.c
index 0d93338ecd..ef63929a43 100644
--- a/ext/intl/dateformat/dateformat_class.c
+++ b/ext/intl/dateformat/dateformat_class.c
@@ -35,35 +35,35 @@ static zend_object_handlers IntlDateFormatter_handlers;
  */
 
 /* {{{ IntlDateFormatter_objects_dtor */
-static void IntlDateFormatter_object_dtor(zend_object *object TSRMLS_DC )
+static void IntlDateFormatter_object_dtor(zend_object *object )
 {
-	zend_objects_destroy_object( object TSRMLS_CC );
+	zend_objects_destroy_object( object );
 }
 /* }}} */
 
 /* {{{ IntlDateFormatter_objects_free */
-void IntlDateFormatter_object_free( zend_object *object TSRMLS_DC )
+void IntlDateFormatter_object_free( zend_object *object )
 {
 	IntlDateFormatter_object* dfo = php_intl_dateformatter_fetch_object(object);
 
-	zend_object_std_dtor( &dfo->zo TSRMLS_CC );
+	zend_object_std_dtor( &dfo->zo );
 
 	if (dfo->requested_locale) {
 		efree( dfo->requested_locale );
 	}
 
-	dateformat_data_free( &dfo->datef_data TSRMLS_CC );
+	dateformat_data_free( &dfo->datef_data );
 }
 /* }}} */
 
 /* {{{ IntlDateFormatter_object_create */
-zend_object *IntlDateFormatter_object_create(zend_class_entry *ce TSRMLS_DC)
+zend_object *IntlDateFormatter_object_create(zend_class_entry *ce)
 {
 	IntlDateFormatter_object*     intern;
 
 	intern = ecalloc( 1, sizeof(IntlDateFormatter_object) + sizeof(zval) * (ce->default_properties_count - 1) );
-	dateformat_data_init( &intern->datef_data TSRMLS_CC );
-	zend_object_std_init( &intern->zo, ce TSRMLS_CC );
+	dateformat_data_init( &intern->datef_data );
+	zend_object_std_init( &intern->zo, ce );
 	object_properties_init(&intern->zo, ce);
 	intern->date_type			= 0;
 	intern->time_type			= 0;
@@ -78,28 +78,28 @@ zend_object *IntlDateFormatter_object_create(zend_class_entry *ce TSRMLS_DC)
 /* }}} */
 
 /* {{{ IntlDateFormatter_object_clone */
-zend_object *IntlDateFormatter_object_clone(zval *object TSRMLS_DC)
+zend_object *IntlDateFormatter_object_clone(zval *object)
 {
 	IntlDateFormatter_object *dfo, *new_dfo;
 	zend_object *new_obj;
 
 	DATE_FORMAT_METHOD_FETCH_OBJECT_NO_CHECK;
 
-	new_obj = IntlDateFormatter_ce_ptr->create_object(Z_OBJCE_P(object) TSRMLS_CC);
+	new_obj = IntlDateFormatter_ce_ptr->create_object(Z_OBJCE_P(object));
 	new_dfo = php_intl_dateformatter_fetch_object(new_obj);
 	/* clone standard parts */	
-	zend_objects_clone_members(&new_dfo->zo, &dfo->zo TSRMLS_CC);
+	zend_objects_clone_members(&new_dfo->zo, &dfo->zo);
 	/* clone formatter object */
 	if (dfo->datef_data.udatf != NULL) {
 		DATE_FORMAT_OBJECT(new_dfo) = udat_clone(DATE_FORMAT_OBJECT(dfo),  &INTL_DATA_ERROR_CODE(dfo));
 		if (U_FAILURE(INTL_DATA_ERROR_CODE(dfo))) {
 			/* set up error in case error handler is interested */
 			intl_errors_set(INTL_DATA_ERROR_P(dfo), INTL_DATA_ERROR_CODE(dfo),
-					"Failed to clone IntlDateFormatter object", 0 TSRMLS_CC );
-			zend_throw_exception(NULL, "Failed to clone IntlDateFormatter object", 0 TSRMLS_CC);
+					"Failed to clone IntlDateFormatter object", 0 );
+			zend_throw_exception(NULL, "Failed to clone IntlDateFormatter object", 0);
 		}
 	} else {
-		zend_throw_exception(NULL, "Cannot clone unconstructed IntlDateFormatter", 0 TSRMLS_CC);
+		zend_throw_exception(NULL, "Cannot clone unconstructed IntlDateFormatter", 0);
 	}
 	return new_obj;
 }
@@ -188,14 +188,14 @@ static zend_function_entry IntlDateFormatter_class_functions[] = {
 /* {{{ dateformat_register_class
  * Initialize 'IntlDateFormatter' class
  */
-void dateformat_register_IntlDateFormatter_class( TSRMLS_D )
+void dateformat_register_IntlDateFormatter_class( void )
 {
 	zend_class_entry ce;
 
 	/* Create and register 'IntlDateFormatter' class. */
 	INIT_CLASS_ENTRY( ce, "IntlDateFormatter", IntlDateFormatter_class_functions );
 	ce.create_object = IntlDateFormatter_object_create;
-	IntlDateFormatter_ce_ptr = zend_register_internal_class( &ce TSRMLS_CC );
+	IntlDateFormatter_ce_ptr = zend_register_internal_class( &ce );
 
 	memcpy(&IntlDateFormatter_handlers, zend_get_std_object_handlers(),
 		sizeof IntlDateFormatter_handlers);