Skip to content

Commit 26bd857

Browse files
committed
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4: Declare may_retry_reparse_point on windows only
2 parents 2da00fa + 31aca85 commit 26bd857

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

Zend/zend_virtual_cwd.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,12 +486,13 @@ CWD_API realpath_cache_bucket** realpath_cache_get_buckets(void)
486486
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) /* {{{ */
487487
{
488488
size_t i, j;
489-
int directory = 0, save, may_retry_reparse_point;
489+
int directory = 0, save;
490490
#ifdef ZEND_WIN32
491491
WIN32_FIND_DATAW dataw;
492492
HANDLE hFind = INVALID_HANDLE_VALUE;
493493
ALLOCA_FLAG(use_heap_large)
494494
wchar_t *pathw = NULL;
495+
int may_retry_reparse_point;
495496
#define FREE_PATHW() \
496497
do { free(pathw); } while(0);
497498

0 commit comments

Comments
 (0)