Fixed ZTS build.

diff --git a/ext/exif/exif.c b/ext/exif/exif.c
index db45c901c7efe196c53c50f3bbf1899972592ca8..5d4b138f8e422206fdba7e0ce425bc44a0948cad 100644 (file)
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -3712,7 +3712,7 @@ static int exif_read_file(image_info_type *ImageInfo, char *FileName, int read_t
                return FALSE;
        }
 
-       php_basename(FileName, strlen(FileName), NULL, 0, &(ImageInfo->FileName), NULL);
+       php_basename(FileName, strlen(FileName), NULL, 0, &(ImageInfo->FileName), NULL TSRMLS_CC);
        ImageInfo->read_thumbnail = read_thumbnail;
        ImageInfo->read_all = read_all;
        ImageInfo->Thumbnail.filetype = IMAGE_FILETYPE_UNKNOWN;

diff --git a/ext/standard/ftp_fopen_wrapper.c b/ext/standard/ftp_fopen_wrapper.c
index 52a4e4e289a2afcb9b73dadb0fdb64569703411e..9674a0ca80d08d7939c1206f552dfce931f7040c 100644 (file)
--- a/ext/standard/ftp_fopen_wrapper.c
+++ b/ext/standard/ftp_fopen_wrapper.c
@@ -576,7 +576,7 @@ static size_t php_ftp_dirstream_read(php_stream *stream, char *buf, size_t count
                return 0;
        }
 
-       php_basename(ent->d_name, tmp_len, NULL, 0, &basename, &basename_len);
+       php_basename(ent->d_name, tmp_len, NULL, 0, &basename, &basename_len TSRMLS_CC);
        if (!basename) {
                return 0;
        }

diff --git a/ext/standard/php_string.h b/ext/standard/php_string.h
index fea95e53cb81fa6974218eabaf0ccc25db450c93..3bf938bad515a138eaa371c280f22900c6af1ec2 100644 (file)
--- a/ext/standard/php_string.h
+++ b/ext/standard/php_string.h
@@ -122,7 +122,7 @@ PHPAPI char *php_addslashes(char *str, int length, int *new_length, int freeit T
 PHPAPI char *php_addcslashes(char *str, int length, int *new_length, int freeit, char *what, int wlength TSRMLS_DC);
 PHPAPI void php_stripslashes(char *str, int *len TSRMLS_DC);
 PHPAPI void php_stripcslashes(char *str, int *len);
-PHPAPI void php_basename(char *str, size_t  len , char *suffix, size_t sufflen, char **p_ret, size_t *p_len);
+PHPAPI void php_basename(char *s, size_t len, char *suffix, size_t sufflen, char **p_ret, size_t *p_len TSRMLS_DC);
 PHPAPI size_t php_dirname(char *str, size_t len);
 PHPAPI char *php_stristr(unsigned char *s, unsigned char *t, size_t s_len, size_t t_len);
 PHPAPI char *php_str_to_str_ex(char *haystack, int length, char *needle,

diff --git a/ext/standard/string.c b/ext/standard/string.c
index 347bf0769793a4f5b369f8b4c3c65047e0650901..7125b3c4cc3b02c9dc9cd4f746e4288740c71dd0 100644 (file)
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -1068,7 +1068,7 @@ PHP_FUNCTION(strtolower)
 
 /* {{{ php_basename
  */
-PHPAPI void php_basename(char *s, size_t len, char *suffix, size_t sufflen, char **p_ret, size_t *p_len)
+PHPAPI void php_basename(char *s, size_t len, char *suffix, size_t sufflen, char **p_ret, size_t *p_len TSRMLS_DC)
 {
        char *ret = NULL, *c, *comp, *cend;
        size_t inc_len, cnt;
@@ -1146,7 +1146,7 @@ PHP_FUNCTION(basename)
                return;
        }
 
-       php_basename(string, string_len, suffix, suffix_len, &ret, &ret_len);
+       php_basename(string, string_len, suffix, suffix_len, &ret, &ret_len TSRMLS_CC);
        RETURN_STRINGL(ret, (int)ret_len, 0);
 }
 /* }}} */
@@ -1265,7 +1265,7 @@ PHP_FUNCTION(pathinfo)
        }
        
        if ((opt & PHP_PATHINFO_BASENAME) == PHP_PATHINFO_BASENAME) {
-               php_basename(path, path_len, NULL, 0, &ret, &ret_len);
+               php_basename(path, path_len, NULL, 0, &ret, &ret_len TSRMLS_CC);
                add_assoc_stringl(tmp, "basename", ret, ret_len, 0);
        }                       
        
@@ -1276,7 +1276,7 @@ PHP_FUNCTION(pathinfo)
 
                /* Have we alrady looked up the basename? */
                if (!have_basename) {
-                       php_basename(path, path_len, NULL, 0, &ret, &ret_len);
+                       php_basename(path, path_len, NULL, 0, &ret, &ret_len TSRMLS_CC);
                }
 
                p = strrchr(ret, '.');