Skip to content

Commit 31aca85

Browse files
committed
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3: Declare may_retry_reparse_point on windows only
2 parents f9ba2ca + 824cbc2 commit 31aca85

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
@@ -492,12 +492,13 @@ CWD_API realpath_cache_bucket** realpath_cache_get_buckets(void)
492492
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) /* {{{ */
493493
{
494494
size_t i, j;
495-
int directory = 0, save, may_retry_reparse_point;
495+
int directory = 0, save;
496496
#ifdef ZEND_WIN32
497497
WIN32_FIND_DATAW dataw;
498498
HANDLE hFind = INVALID_HANDLE_VALUE;
499499
ALLOCA_FLAG(use_heap_large)
500500
wchar_t *pathw = NULL;
501+
int may_retry_reparse_point;
501502
#define FREE_PATHW() \
502503
do { free(pathw); } while(0);
503504

0 commit comments

Comments
 (0)