diff options
Diffstat (limited to 'ext/intl/grapheme/grapheme_util.c')
| -rw-r--r-- | ext/intl/grapheme/grapheme_util.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ext/intl/grapheme/grapheme_util.c b/ext/intl/grapheme/grapheme_util.c index 5e94eefc8a..bb4ecac084 100644 --- a/ext/intl/grapheme/grapheme_util.c +++ b/ext/intl/grapheme/grapheme_util.c @@ -38,7 +38,7 @@ ZEND_EXTERN_MODULE_GLOBALS( intl ) /* {{{ grapheme_close_global_iterator - clean up */ void -grapheme_close_global_iterator( TSRMLS_D ) +grapheme_close_global_iterator( void ) { UBreakIterator *global_break_iterator = INTL_G( grapheme_iterator ); @@ -109,8 +109,8 @@ void grapheme_substr_ascii(char *str, int str_len, int f, int l, int argc, char #define STRPOS_CHECK_STATUS(status, error) \ if ( U_FAILURE( (status) ) ) { \ - intl_error_set_code( NULL, (status) TSRMLS_CC ); \ - intl_error_set_custom_msg( NULL, (error), 0 TSRMLS_CC ); \ + intl_error_set_code( NULL, (status) ); \ + intl_error_set_custom_msg( NULL, (error), 0 ); \ if (uhaystack) { \ efree( uhaystack ); \ } \ @@ -128,7 +128,7 @@ void grapheme_substr_ascii(char *str, int str_len, int f, int l, int argc, char /* {{{ grapheme_strpos_utf16 - strrpos using utf16*/ -int grapheme_strpos_utf16(unsigned char *haystack, int32_t haystack_len, unsigned char*needle, int32_t needle_len, int32_t offset, int32_t *puchar_pos, int f_ignore_case, int last TSRMLS_DC) +int grapheme_strpos_utf16(unsigned char *haystack, int32_t haystack_len, unsigned char*needle, int32_t needle_len, int32_t offset, int32_t *puchar_pos, int f_ignore_case, int last) { UChar *uhaystack = NULL, *uneedle = NULL; int32_t uhaystack_len = 0, uneedle_len = 0, char_pos, ret_pos, offset_pos = 0; @@ -153,7 +153,7 @@ int grapheme_strpos_utf16(unsigned char *haystack, int32_t haystack_len, unsigne /* get a pointer to the haystack taking into account the offset */ status = U_ZERO_ERROR; - bi = grapheme_get_break_iterator(u_break_iterator_buffer, &status TSRMLS_CC ); + bi = grapheme_get_break_iterator(u_break_iterator_buffer, &status ); STRPOS_CHECK_STATUS(status, "Failed to get iterator"); status = U_ZERO_ERROR; ubrk_setText(bi, uhaystack, uhaystack_len, &status); @@ -231,14 +231,14 @@ int grapheme_ascii_check(const unsigned char *day, int32_t len) /* }}} */ /* {{{ grapheme_split_string: find and optionally return grapheme boundaries */ -int grapheme_split_string(const UChar *text, int32_t text_length, int boundary_array[], int boundary_array_len TSRMLS_DC ) +int grapheme_split_string(const UChar *text, int32_t text_length, int boundary_array[], int boundary_array_len ) { unsigned char u_break_iterator_buffer[U_BRK_SAFECLONE_BUFFERSIZE]; UErrorCode status = U_ZERO_ERROR; int ret_len, pos; UBreakIterator* bi; - bi = grapheme_get_break_iterator((void*)u_break_iterator_buffer, &status TSRMLS_CC ); + bi = grapheme_get_break_iterator((void*)u_break_iterator_buffer, &status ); if( U_FAILURE(status) ) { return -1; @@ -374,7 +374,7 @@ grapheme_strrpos_ascii(unsigned char *haystack, int32_t haystack_len, unsigned c /* }}} */ /* {{{ grapheme_get_break_iterator: get a clone of the global character break iterator */ -UBreakIterator* grapheme_get_break_iterator(void *stack_buffer, UErrorCode *status TSRMLS_DC ) +UBreakIterator* grapheme_get_break_iterator(void *stack_buffer, UErrorCode *status ) { int32_t buffer_size; |