diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-10-26 12:40:56 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-10-26 12:40:56 +0100 |
| commit | 31aca85572ff90945bafab1cde5d983188330c4f (patch) | |
| tree | c298cc7e4ed1b96e593f93ae0877a1fd70b2be5f | |
| parent | f9ba2ca1360531bc6f8ff26ac3ade7c498685f31 (diff) | |
| parent | 824cbc27819f3f6dd6de24e182dbb7de6273b2ab (diff) | |
| download | php-git-31aca85572ff90945bafab1cde5d983188330c4f.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
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 382a40d6ca..d1ec9e35ff 100644 --- a/Zend/zend_virtual_cwd.c +++ b/Zend/zend_virtual_cwd.c @@ -492,12 +492,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, int 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); |