diff options
author | Remi Collet <remi@php.net> | 2017-03-01 17:02:42 +0100 |
---|---|---|
committer | Remi Collet <remi@php.net> | 2017-03-01 17:02:42 +0100 |
commit | 2f955d5d0a6708dd54cfcf4d53dad7f0efe93a2e (patch) | |
tree | 0b928e3e3fd512f915d56f93a7d9f1ca386c9aa1 /ext | |
parent | c5727a30cfdfec90af3614244216b9f1959f2125 (diff) | |
parent | 53a08fd07d37062c8605202ab973f311d738c59a (diff) | |
download | php-git-2f955d5d0a6708dd54cfcf4d53dad7f0efe93a2e.tar.gz |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
make type consistent with glob_t.gl_pathc
Diffstat (limited to 'ext')
-rw-r--r-- | ext/zip/php_zip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c index bd6684c26f..28527cbee1 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -499,7 +499,7 @@ int php_zip_glob(char *pattern, int pattern_len, zend_long flags, zval *return_v char *result; #endif glob_t globbuf; - uint n; + size_t n; int ret; if (pattern_len >= MAXPATHLEN) { |