first shot remove TSRMLS_* things

1 files changed, 15 insertions, 15 deletions

diff --git a/ext/intl/formatter/formatter_class.c b/ext/intl/formatter/formatter_class.c
index 8fcc155e85..aa8844cca0 100644
--- a/ext/intl/formatter/formatter_class.c
+++ b/ext/intl/formatter/formatter_class.c
@@ -38,29 +38,29 @@ static void NumberFormatter_object_dtor(
 	zend_object *object
 	TSRMLS_DC )
 {
-	zend_objects_destroy_object( object TSRMLS_CC );
+	zend_objects_destroy_object( object );
 }
 /* }}} */
 
 /* {{{ NumberFormatter_objects_free */
-void NumberFormatter_object_free( zend_object *object TSRMLS_DC )
+void NumberFormatter_object_free( zend_object *object )
 {
 	NumberFormatter_object* nfo = php_intl_number_format_fetch_object(object);
 
-	zend_object_std_dtor( &nfo->zo TSRMLS_CC );
+	zend_object_std_dtor( &nfo->zo );
 
-	formatter_data_free( &nfo->nf_data TSRMLS_CC );
+	formatter_data_free( &nfo->nf_data );
 }
 /* }}} */
 
 /* {{{ NumberFormatter_object_create */
-zend_object *NumberFormatter_object_create(zend_class_entry *ce TSRMLS_DC)
+zend_object *NumberFormatter_object_create(zend_class_entry *ce)
 {
 	NumberFormatter_object*     intern;
 
 	intern = ecalloc( 1, sizeof(NumberFormatter_object) + sizeof(zval) * (ce->default_properties_count - 1) );
-	formatter_data_init( &intern->nf_data TSRMLS_CC );
-	zend_object_std_init( &intern->zo, ce TSRMLS_CC );
+	formatter_data_init( &intern->nf_data );
+	zend_object_std_init( &intern->zo, ce );
 	object_properties_init(&intern->zo, ce);
 
 	intern->zo.handlers = &NumberFormatter_handlers;
@@ -70,16 +70,16 @@ zend_object *NumberFormatter_object_create(zend_class_entry *ce TSRMLS_DC)
 /* }}} */
 
 /* {{{ NumberFormatter_object_clone */
-zend_object *NumberFormatter_object_clone(zval *object TSRMLS_DC)
+zend_object *NumberFormatter_object_clone(zval *object)
 {
 	NumberFormatter_object *nfo, *new_nfo;
 	zend_object *new_obj;
 
 	FORMATTER_METHOD_FETCH_OBJECT_NO_CHECK;
-	new_obj = NumberFormatter_ce_ptr->create_object(Z_OBJCE_P(object) TSRMLS_CC);
+	new_obj = NumberFormatter_ce_ptr->create_object(Z_OBJCE_P(object));
 	new_nfo = php_intl_number_format_fetch_object(new_obj);
 	/* clone standard parts */	
-	zend_objects_clone_members(&new_nfo->zo, &nfo->zo TSRMLS_CC);
+	zend_objects_clone_members(&new_nfo->zo, &nfo->zo);
 	/* clone formatter object. It may fail, the destruction code must handle this case */
 	if (FORMATTER_OBJECT(nfo) != NULL) {
 		FORMATTER_OBJECT(new_nfo) = unum_clone(FORMATTER_OBJECT(nfo),
@@ -87,11 +87,11 @@ zend_object *NumberFormatter_object_clone(zval *object TSRMLS_DC)
 		if (U_FAILURE(INTL_DATA_ERROR_CODE(nfo))) {
 			/* set up error in case error handler is interested */
 			intl_errors_set(INTL_DATA_ERROR_P(nfo), INTL_DATA_ERROR_CODE(nfo),
-					"Failed to clone NumberFormatter object", 0 TSRMLS_CC);
-			zend_throw_exception(NULL, "Failed to clone NumberFormatter object", 0 TSRMLS_CC);
+					"Failed to clone NumberFormatter object", 0);
+			zend_throw_exception(NULL, "Failed to clone NumberFormatter object", 0);
 		}
 	} else {
-		zend_throw_exception(NULL, "Cannot clone unconstructed NumberFormatter", 0 TSRMLS_CC);
+		zend_throw_exception(NULL, "Cannot clone unconstructed NumberFormatter", 0);
 	}
 	return new_obj;
 }
@@ -184,14 +184,14 @@ static zend_function_entry NumberFormatter_class_functions[] = {
 /* {{{ formatter_register_class
  * Initialize 'NumberFormatter' class
  */
-void formatter_register_class( TSRMLS_D )
+void formatter_register_class( void )
 {
 	zend_class_entry ce;
 
 	/* Create and register 'NumberFormatter' class. */
 	INIT_CLASS_ENTRY( ce, "NumberFormatter", NumberFormatter_class_functions );
 	ce.create_object = NumberFormatter_object_create;
-	NumberFormatter_ce_ptr = zend_register_internal_class( &ce TSRMLS_CC );
+	NumberFormatter_ce_ptr = zend_register_internal_class( &ce );
 
 	memcpy(&NumberFormatter_handlers, zend_get_std_object_handlers(),
 		sizeof(NumberFormatter_handlers));