dmitry Tue Aug 22 04:54:00 2006 UTC
Modified files:
/php-src/ext/standard string.c
Log:
ZTS fix
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.582&r2=1.583&diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.582 php-src/ext/standard/string.c:1.583
--- php-src/ext/standard/string.c:1.582 Fri Aug 18 18:01:58 2006
+++ php-src/ext/standard/string.c Tue Aug 22 04:54:00 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.582 2006/08/18 18:01:58 andrei Exp $ */
+/* $Id: string.c,v 1.583 2006/08/22 04:54:00 dmitry Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -6938,7 +6938,7 @@
/* }}} */
/* {{{ php_str_word_count */
-static int php_str_word_count(char *str, int str_len, long type, char
*char_list, int char_list_len, zval *return_value)
+static int php_str_word_count(char *str, int str_len, long type, char
*char_list, int char_list_len, zval *return_value TSRMLS_DC)
{
char ch[256], *p, *e, *s, *buf;
int word_count = 0;
@@ -7017,7 +7017,7 @@
if (str_type == IS_UNICODE) {
word_count = php_u_str_word_count(str.u, str_len, type,
char_list.u, char_list_len, return_value TSRMLS_CC);
} else {
- word_count = php_str_word_count(str.s, str_len, type,
char_list.s, char_list_len, return_value);
+ word_count = php_str_word_count(str.s, str_len, type,
char_list.s, char_list_len, return_value TSRMLS_CC);
}
if (!type) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
