sebastian Tue Oct 8 01:08:39 2002 EDT
Modified files:
/php4/ext/mbstring php_mbregex.c php_mbregex.h
Log:
Fix ZTS build.
Index: php4/ext/mbstring/php_mbregex.c
diff -u php4/ext/mbstring/php_mbregex.c:1.13 php4/ext/mbstring/php_mbregex.c:1.14
--- php4/ext/mbstring/php_mbregex.c:1.13 Mon Oct 7 16:12:48 2002
+++ php4/ext/mbstring/php_mbregex.c Tue Oct 8 01:08:39 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mbregex.c,v 1.13 2002/10/07 20:12:48 moriyoshi Exp $ */
+/* $Id: php_mbregex.c,v 1.14 2002/10/08 05:08:39 sebastian Exp $ */
#ifdef HAVE_CONFIG_H
@@ -529,7 +529,7 @@
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_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 @@
/* }}} */
/* {{{ 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 @@
&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;
}
/* }}} */
Index: php4/ext/mbstring/php_mbregex.h
diff -u php4/ext/mbstring/php_mbregex.h:1.1 php4/ext/mbstring/php_mbregex.h:1.2
--- php4/ext/mbstring/php_mbregex.h:1.1 Mon Oct 7 13:59:49 2002
+++ php4/ext/mbstring/php_mbregex.h Tue Oct 8 01:08:39 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mbregex.h,v 1.1 2002/10/07 17:59:49 moriyoshi Exp $ */
+/* $Id: php_mbregex.h,v 1.2 2002/10/08 05:08:39 sebastian Exp $ */
#ifndef _PHP_MBREGEX_H
#define _PHP_MBREGEX_H
@@ -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);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
