first shot remove TSRMLS_* things

1 files changed, 18 insertions, 18 deletions

diff --git a/Zend/zend_multibyte.h b/Zend/zend_multibyte.h
index db2db1a971..7d6f45280f 100644
--- a/Zend/zend_multibyte.h
+++ b/Zend/zend_multibyte.h
@@ -24,16 +24,16 @@
 
 typedef struct _zend_encoding zend_encoding;
 
-typedef size_t (*zend_encoding_filter)(unsigned char **str, size_t *str_length, const unsigned char *buf, size_t length TSRMLS_DC);
+typedef size_t (*zend_encoding_filter)(unsigned char **str, size_t *str_length, const unsigned char *buf, size_t length);
 
-typedef const zend_encoding* (*zend_encoding_fetcher)(const char *encoding_name TSRMLS_DC);
+typedef const zend_encoding* (*zend_encoding_fetcher)(const char *encoding_name);
 typedef const char* (*zend_encoding_name_getter)(const zend_encoding *encoding);
 typedef int (*zend_encoding_lexer_compatibility_checker)(const zend_encoding *encoding);
-typedef const zend_encoding *(*zend_encoding_detector)(const unsigned char *string, size_t length, const zend_encoding **list, size_t list_size TSRMLS_DC);
-typedef size_t (*zend_encoding_converter)(unsigned char **to, size_t *to_length, const unsigned char *from, size_t from_length, const zend_encoding *encoding_to, const zend_encoding *encoding_from TSRMLS_DC);
-typedef int (*zend_encoding_list_parser)(const char *encoding_list, size_t encoding_list_len, const zend_encoding ***return_list, size_t *return_size, int persistent TSRMLS_DC);
-typedef const zend_encoding *(*zend_encoding_internal_encoding_getter)(TSRMLS_D);
-typedef int (*zend_encoding_internal_encoding_setter)(const zend_encoding *encoding TSRMLS_DC);
+typedef const zend_encoding *(*zend_encoding_detector)(const unsigned char *string, size_t length, const zend_encoding **list, size_t list_size);
+typedef size_t (*zend_encoding_converter)(unsigned char **to, size_t *to_length, const unsigned char *from, size_t from_length, const zend_encoding *encoding_to, const zend_encoding *encoding_from);
+typedef int (*zend_encoding_list_parser)(const char *encoding_list, size_t encoding_list_len, const zend_encoding ***return_list, size_t *return_size, int persistent);
+typedef const zend_encoding *(*zend_encoding_internal_encoding_getter)(void);
+typedef int (*zend_encoding_internal_encoding_setter)(const zend_encoding *encoding);
 
 typedef struct _zend_multibyte_functions {
     const char *provider_name;
@@ -59,21 +59,21 @@ ZEND_API extern const zend_encoding *zend_multibyte_encoding_utf16le;
 ZEND_API extern const zend_encoding *zend_multibyte_encoding_utf8;
 
 /* multibyte utility functions */
-ZEND_API int zend_multibyte_set_functions(const zend_multibyte_functions *functions TSRMLS_DC);
-ZEND_API const zend_multibyte_functions *zend_multibyte_get_functions(TSRMLS_D);
+ZEND_API int zend_multibyte_set_functions(const zend_multibyte_functions *functions);
+ZEND_API const zend_multibyte_functions *zend_multibyte_get_functions(void);
 
-ZEND_API const zend_encoding *zend_multibyte_fetch_encoding(const char *name TSRMLS_DC);
+ZEND_API const zend_encoding *zend_multibyte_fetch_encoding(const char *name);
 ZEND_API const char *zend_multibyte_get_encoding_name(const zend_encoding *encoding);
 ZEND_API int zend_multibyte_check_lexer_compatibility(const zend_encoding *encoding);
-ZEND_API const zend_encoding *zend_multibyte_encoding_detector(const unsigned char *string, size_t length, const zend_encoding **list, size_t list_size TSRMLS_DC);
-ZEND_API size_t zend_multibyte_encoding_converter(unsigned char **to, size_t *to_length, const unsigned char *from, size_t from_length, const zend_encoding *encoding_to, const zend_encoding *encoding_from TSRMLS_DC);
-ZEND_API int zend_multibyte_parse_encoding_list(const char *encoding_list, size_t encoding_list_len, const zend_encoding ***return_list, size_t *return_size, int persistent TSRMLS_DC);
+ZEND_API const zend_encoding *zend_multibyte_encoding_detector(const unsigned char *string, size_t length, const zend_encoding **list, size_t list_size);
+ZEND_API size_t zend_multibyte_encoding_converter(unsigned char **to, size_t *to_length, const unsigned char *from, size_t from_length, const zend_encoding *encoding_to, const zend_encoding *encoding_from);
+ZEND_API int zend_multibyte_parse_encoding_list(const char *encoding_list, size_t encoding_list_len, const zend_encoding ***return_list, size_t *return_size, int persistent);
 
-ZEND_API const zend_encoding *zend_multibyte_get_internal_encoding(TSRMLS_D);
-ZEND_API const zend_encoding *zend_multibyte_get_script_encoding(TSRMLS_D);
-ZEND_API int zend_multibyte_set_script_encoding(const zend_encoding **encoding_list, size_t encoding_list_size TSRMLS_DC);
-ZEND_API int zend_multibyte_set_internal_encoding(const zend_encoding *encoding TSRMLS_DC);
-ZEND_API int zend_multibyte_set_script_encoding_by_string(const char *new_value, size_t new_value_length TSRMLS_DC);
+ZEND_API const zend_encoding *zend_multibyte_get_internal_encoding(void);
+ZEND_API const zend_encoding *zend_multibyte_get_script_encoding(void);
+ZEND_API int zend_multibyte_set_script_encoding(const zend_encoding **encoding_list, size_t encoding_list_size);
+ZEND_API int zend_multibyte_set_internal_encoding(const zend_encoding *encoding);
+ZEND_API int zend_multibyte_set_script_encoding_by_string(const char *new_value, size_t new_value_length);
 
 END_EXTERN_C()