mirror of
https://github.com/php/php-src.git
synced 2025-08-16 05:58:45 +02:00
Fix ZTS build.
This commit is contained in:
parent
b68028988a
commit
af8230e28c
2 changed files with 7 additions and 7 deletions
|
@ -529,7 +529,7 @@ PHP_FUNCTION(mb_split)
|
|||
|
||||
count = -1;
|
||||
|
||||
if (zend_parse_parameters(ZEND_NUM_ARGS(), "zs|l", &arg_pat,
|
||||
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zs|l", &arg_pat,
|
||||
&string, &string_len, &count) == FAILURE) {
|
||||
RETURN_FALSE;
|
||||
}
|
||||
|
@ -957,7 +957,7 @@ PHP_FUNCTION(mb_ereg_search_setpos)
|
|||
/* }}} */
|
||||
|
||||
/* {{{ php_mb_regex_set_options */
|
||||
PHPAPI int php_mb_regex_set_options( int options )
|
||||
PHPAPI int php_mb_regex_set_options( int options TSRMLS_DC)
|
||||
{
|
||||
int prev_opt = MBSTRG(regex_default_options);
|
||||
MBSTRG(regex_default_options) = options;
|
||||
|
@ -966,11 +966,11 @@ PHPAPI int php_mb_regex_set_options( int options )
|
|||
/* }}} */
|
||||
|
||||
/* {{{ php_mb_regex_set_options_by_string */
|
||||
PHPAPI int php_mb_regex_set_options_by_string( const char *opt_str, int len )
|
||||
PHPAPI int php_mb_regex_set_options_by_string( const char *opt_str, int len TSRMLS_DC)
|
||||
{
|
||||
int new_opt;
|
||||
_php_mb_regex_init_options( opt_str, len, &new_opt, NULL);
|
||||
return php_mb_regex_set_options( new_opt );
|
||||
return php_mb_regex_set_options( new_opt TSRMLS_CC);
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
|
@ -984,7 +984,7 @@ PHP_FUNCTION(mb_regex_set_options)
|
|||
&string, &string_len ) == FAILURE ) {
|
||||
RETURN_FALSE;
|
||||
}
|
||||
php_mb_regex_set_options_by_string( (const char*)string, string_len );
|
||||
php_mb_regex_set_options_by_string( (const char*)string, string_len TSRMLS_CC);
|
||||
RETURN_TRUE;
|
||||
}
|
||||
/* }}} */
|
||||
|
|
|
@ -43,8 +43,8 @@
|
|||
#define PHP_MBREGEX_MAXCACHE 50
|
||||
|
||||
PHPAPI int php_mb_regex_name2mbctype(const char *pname);
|
||||
PHPAPI int php_mb_regex_set_options(int options);
|
||||
PHPAPI int php_mb_regex_set_options_by_string(const char *optstr, int len);
|
||||
PHPAPI int php_mb_regex_set_options(int options TSRMLS_DC);
|
||||
PHPAPI int php_mb_regex_set_options_by_string(const char *optstr, int len TSRMLS_DC);
|
||||
|
||||
PHP_FUNCTION(mb_regex_encoding);
|
||||
PHP_FUNCTION(mb_ereg);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue