diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-10-26 12:41:12 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-10-26 12:41:12 +0100 |
| commit | 26bd857999f4f8a1df0d2e9682fb83c10048472d (patch) | |
| tree | ab6a12c3d2cac0b321d6b3f29532f95751e3a73a | |
| parent | 2da00fadc8feff97214fa9f8845fa7bd7bb4cba5 (diff) | |
| parent | 31aca85572ff90945bafab1cde5d983188330c4f (diff) | |
| download | php-git-26bd857999f4f8a1df0d2e9682fb83c10048472d.tar.gz | |
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Declare may_retry_reparse_point on windows only
| -rw-r--r-- | Zend/zend_virtual_cwd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Zend/zend_virtual_cwd.c b/Zend/zend_virtual_cwd.c index b6f1433584..71f9781442 100644 --- a/Zend/zend_virtual_cwd.c +++ b/Zend/zend_virtual_cwd.c @@ -486,12 +486,13 @@ CWD_API realpath_cache_bucket** realpath_cache_get_buckets(void) static size_t tsrm_realpath_r(char *path, size_t start, size_t len, int *ll, time_t *t, int use_realpath, bool is_dir, int *link_is_dir) /* {{{ */ { size_t i, j; - int directory = 0, save, may_retry_reparse_point; + int directory = 0, save; #ifdef ZEND_WIN32 WIN32_FIND_DATAW dataw; HANDLE hFind = INVALID_HANDLE_VALUE; ALLOCA_FLAG(use_heap_large) wchar_t *pathw = NULL; + int may_retry_reparse_point; #define FREE_PATHW() \ do { free(pathw); } while(0); |