tony2001 Sat Sep 23 12:22:07 2006 UTC
Modified files:
/php-src/ext/standard string.c
Log:
one more try to fix ZTS build
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.592&r2=1.593&diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.592 php-src/ext/standard/string.c:1.593
--- php-src/ext/standard/string.c:1.592 Sat Sep 23 12:17:43 2006
+++ php-src/ext/standard/string.c Sat Sep 23 12:22:07 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.592 2006/09/23 12:17:43 tony2001 Exp $ */
+/* $Id: string.c,v 1.593 2006/09/23 12:22:07 tony2001 Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -3418,7 +3418,7 @@
UChar cp;
zend_uchar type;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_DC, "t", &old,
&old_len, &type) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "t", &old,
&old_len, &type) == FAILURE) {
return;
}
@@ -5546,7 +5546,7 @@
}
if (UG(unicode)) {
- php_error_docref(NULL TSRMLS_DC, E_STRICT, "deprecated in
Unicode mode, please use ICU locale functions");
+ php_error_docref(NULL TSRMLS_CC, E_STRICT, "deprecated in
Unicode mode, please use ICU locale functions");
}
#ifdef HAVE_SETLOCALE
@@ -6358,7 +6358,7 @@
RETURN_FALSE;
}
if (UG(unicode) && mode != 1) {
- php_error_docref(NULL TSRMLS_DC, E_WARNING, "Only
mode=1 is supported with Unicode strings");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Only
mode=1 is supported with Unicode strings");
}
}
@@ -6483,7 +6483,7 @@
}
if (UG(unicode)) {
- php_error_docref(NULL TSRMLS_DC, E_STRICT, "deprecated in
Unicode mode, please use ICU locale functions");
+ php_error_docref(NULL TSRMLS_CC, E_STRICT, "deprecated in
Unicode mode, please use ICU locale functions");
}
MAKE_STD_ZVAL(grouping);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
