diff options
author | Anatol Belski <ab@php.net> | 2014-12-13 23:06:14 +0100 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2014-12-13 23:06:14 +0100 |
commit | bdeb220f48825642f84cdbf3ff23a30613c92e86 (patch) | |
tree | 1a6cf34d20420e4815b4becb21311a4457d84103 /ext/intl/php_intl.c | |
parent | bb66f385d09e7e55390e9f57fcbca08f6b43ff91 (diff) | |
download | php-git-bdeb220f48825642f84cdbf3ff23a30613c92e86.tar.gz |
first shot remove TSRMLS_* things
Diffstat (limited to 'ext/intl/php_intl.c')
-rw-r--r-- | ext/intl/php_intl.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/ext/intl/php_intl.c b/ext/intl/php_intl.c index 15f058d2b4..2ac1888061 100644 --- a/ext/intl/php_intl.c +++ b/ext/intl/php_intl.c @@ -116,7 +116,7 @@ ZEND_DECLARE_MODULE_GLOBALS( intl ) -const char *intl_locale_get_default( TSRMLS_D ) +const char *intl_locale_get_default( void ) { if( INTL_G(default_locale) == NULL ) { return uloc_getDefault(); @@ -923,53 +923,53 @@ PHP_MINIT_FUNCTION( intl ) #endif /* Register 'Collator' PHP class */ - collator_register_Collator_class( TSRMLS_C ); + collator_register_Collator_class( ); /* Expose Collator constants to PHP scripts */ collator_register_constants( INIT_FUNC_ARGS_PASSTHRU ); /* Register 'NumberFormatter' PHP class */ - formatter_register_class( TSRMLS_C ); + formatter_register_class( ); /* Expose NumberFormatter constants to PHP scripts */ formatter_register_constants( INIT_FUNC_ARGS_PASSTHRU ); /* Register 'Normalizer' PHP class */ - normalizer_register_Normalizer_class( TSRMLS_C ); + normalizer_register_Normalizer_class( ); /* Expose Normalizer constants to PHP scripts */ normalizer_register_constants( INIT_FUNC_ARGS_PASSTHRU ); /* Register 'Locale' PHP class */ - locale_register_Locale_class( TSRMLS_C ); + locale_register_Locale_class( ); /* Expose Locale constants to PHP scripts */ locale_register_constants( INIT_FUNC_ARGS_PASSTHRU ); - msgformat_register_class(TSRMLS_C); + msgformat_register_class(); grapheme_register_constants( INIT_FUNC_ARGS_PASSTHRU ); /* Register 'DateFormat' PHP class */ - dateformat_register_IntlDateFormatter_class( TSRMLS_C ); + dateformat_register_IntlDateFormatter_class( ); /* Expose DateFormat constants to PHP scripts */ dateformat_register_constants( INIT_FUNC_ARGS_PASSTHRU ); /* Register 'ResourceBundle' PHP class */ - resourcebundle_register_class( TSRMLS_C); + resourcebundle_register_class( ); /* Register 'Transliterator' PHP class */ - transliterator_register_Transliterator_class( TSRMLS_C ); + transliterator_register_Transliterator_class( ); /* Register Transliterator constants */ transliterator_register_constants( INIT_FUNC_ARGS_PASSTHRU ); /* Register 'IntlTimeZone' PHP class */ - timezone_register_IntlTimeZone_class( TSRMLS_C ); + timezone_register_IntlTimeZone_class( ); /* Register 'IntlCalendar' PHP class */ - calendar_register_IntlCalendar_class( TSRMLS_C ); + calendar_register_IntlCalendar_class( ); /* Expose ICU error codes to PHP scripts. */ intl_expose_icu_error_codes( INIT_FUNC_ARGS_PASSTHRU ); @@ -979,26 +979,26 @@ PHP_MINIT_FUNCTION( intl ) #if U_ICU_VERSION_MAJOR_NUM * 1000 + U_ICU_VERSION_MINOR_NUM >= 4002 /* Register 'Spoofchecker' PHP class */ - spoofchecker_register_Spoofchecker_class( TSRMLS_C ); + spoofchecker_register_Spoofchecker_class( ); /* Expose Spoofchecker constants to PHP scripts */ spoofchecker_register_constants( INIT_FUNC_ARGS_PASSTHRU ); #endif /* Register 'IntlException' PHP class */ - intl_register_IntlException_class( TSRMLS_C ); + intl_register_IntlException_class( ); /* Register 'IntlIterator' PHP class */ - intl_register_IntlIterator_class( TSRMLS_C ); + intl_register_IntlIterator_class( ); /* Register 'BreakIterator' class */ - breakiterator_register_BreakIterator_class( TSRMLS_C ); + breakiterator_register_BreakIterator_class( ); /* Register 'IntlPartsIterator' class */ - breakiterator_register_IntlPartsIterator_class( TSRMLS_C ); + breakiterator_register_IntlPartsIterator_class( ); /* Global error handling. */ - intl_error_init( NULL TSRMLS_CC ); + intl_error_init( NULL ); /* 'Converter' class for codepage conversions */ php_converter_minit(INIT_FUNC_ARGS_PASSTHRU); @@ -1042,11 +1042,11 @@ PHP_RSHUTDOWN_FUNCTION( intl ) ZVAL_UNDEF(&INTL_G(current_collator)); } if (INTL_G(grapheme_iterator)) { - grapheme_close_global_iterator( TSRMLS_C ); + grapheme_close_global_iterator( ); INTL_G(grapheme_iterator) = NULL; } - intl_error_reset( NULL TSRMLS_CC); + intl_error_reset( NULL); return SUCCESS; } /* }}} */ |