clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ZTS build.

Browse Source
This commit is contained in:
Moriyoshi Koizumi 2011-03-06 07:06:55 +00:00
parent cdb9ee0d1a
commit b2ddc6de23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ext/mbstring/mbstring.c
View File

@ -1132,14 +1132,14 @@ static char *php_mb_rfc1867_getword_conf(const zend_encoding *encoding, char *st
char quote = *str;
str++;
return php_mb_rfc1867_substring_conf(encoding, str, strlen(str), quote);
return php_mb_rfc1867_substring_conf(encoding, str, strlen(str), quote TSRMLS_CC);
} else {
char *strend = str;
while (*strend && !isspace(*(unsigned char *)strend)) {
++strend;
}
return php_mb_rfc1867_substring_conf(encoding, str, strend - str, 0);
return php_mb_rfc1867_substring_conf(encoding, str, strend - str, 0 TSRMLS_CC);
}
}
/* }}} */
@ -1154,8 +1154,8 @@ static char *php_mb_rfc1867_basename(const zend_encoding *encoding, char *filena
* the full path of the file on the user's filesystem, which means that unless
* the user does basename() they get a bogus file name. Until IE's user base drops
* to nill or problem is fixed this code must remain enabled for all systems. */
s = php_mb_safe_strrchr_ex(filename, '\\', filename_len, (const mbfl_encoding *)encoding TSRMLS_CC);
if ((tmp = php_mb_safe_strrchr_ex(filename, '/', filename_len, (const mbfl_encoding *)encoding TSRMLS_CC)) > s) {
s = php_mb_safe_strrchr_ex(filename, '\\', filename_len, (const mbfl_encoding *)encoding);
if ((tmp = php_mb_safe_strrchr_ex(filename, '/', filename_len, (const mbfl_encoding *)encoding)) > s) {
s = tmp;
}
if (s) {

2
main/rfc1867.c
View File

@ -743,7 +743,7 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler) /* {{{ */
}
/* Initialize the buffer */
if (!(mbuff = multipart_buffer_new(boundary, boundary_len))) {
if (!(mbuff = multipart_buffer_new(boundary, boundary_len TSRMLS_CC))) {
sapi_module.sapi_error(E_WARNING, "Unable to initialize the input buffer");
return;
}