From: Nikita Popov <nikita.ppv@gmail.com>
Date: Mon, 26 Oct 2020 11:41:12 +0000 (+0100)
Subject: Merge branch 'PHP-7.4' into PHP-8.0
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=26bd857999f4f8a1df0d2e9682fb83c10048472d;p=php

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Declare may_retry_reparse_point on windows only
---

26bd857999f4f8a1df0d2e9682fb83c10048472d
diff --cc Zend/zend_virtual_cwd.c
index b6f1433584,d1ec9e35ff..71f9781442
--- a/Zend/zend_virtual_cwd.c
+++ b/Zend/zend_virtual_cwd.c
@@@ -483,10 -489,10 +483,10 @@@ CWD_API realpath_cache_bucket** realpat
  #undef LINK_MAX
  #define LINK_MAX 32
  
 -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) /* {{{ */
 +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;