From: Anatol Belski Date: Wed, 22 Oct 2014 17:46:51 +0000 (+0200) Subject: fix datatype mismatch warnings X-Git-Tag: POST_NATIVE_TLS_MERGE^2~49^2~39^2~6 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1a727e519b246bc3dc612d87ab96888bf487b0bc;p=php fix datatype mismatch warnings --- diff --git a/ext/standard/dir.c b/ext/standard/dir.c index 7b4ab1cd3e..a822ac4da0 100644 --- a/ext/standard/dir.c +++ b/ext/standard/dir.c @@ -87,7 +87,7 @@ static zend_class_entry *dir_class_entry_ptr; } \ ZEND_FETCH_RESOURCE(dirp, php_stream *, tmp, -1, "Directory", php_file_le_stream()); \ } else { \ - ZEND_FETCH_RESOURCE(dirp, php_stream *, 0, DIRG(default_dir)->handle, "Directory", php_file_le_stream()); \ + ZEND_FETCH_RESOURCE(dirp, php_stream *, 0, (int)DIRG(default_dir)->handle, "Directory", php_file_le_stream()); \ } \ } else { \ dirp = (php_stream *) zend_fetch_resource(id TSRMLS_CC, -1, "Directory", NULL, 1, php_file_le_stream()); \ @@ -463,7 +463,7 @@ PHP_FUNCTION(glob) cwd[2] = '\0'; } #endif - cwd_skip = strlen(cwd)+1; + cwd_skip = (int)strlen(cwd)+1; snprintf(work_pattern, MAXPATHLEN, "%s%c%s", cwd, DEFAULT_SLASH, pattern); pattern = work_pattern;