Merge branch 'PHP-7.4'

* PHP-7.4:
  Try to fix msvc build

diff --cc ext/opcache/ZendAccelerator.c
index 7aaaa6d0302f6da07e7af72c0180535322f7a12a,758f8fc4bff51b678ca749a948f439d9b17f97cc..fb3a725b8557bfa13ca5b516b87320f00c64c1a2
--- 1/ext/opcache/ZendAccelerator.c
--- 2/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@@ -4306,8 -4236,8 +4306,8 @@@ static void preload_load(void
                size_t old_map_ptr_last = CG(map_ptr_last);
                CG(map_ptr_last) = ZCSG(map_ptr_last);
                CG(map_ptr_size) = ZEND_MM_ALIGNED_SIZE_EX(CG(map_ptr_last) + 1, 4096);
 -              CG(map_ptr_base) = perealloc(CG(map_ptr_base), CG(map_ptr_size) * sizeof(void*), 1);
 -              memset((void **) CG(map_ptr_base) + old_map_ptr_last, 0,
 +              ZEND_MAP_PTR_SET_REAL_BASE(CG(map_ptr_base), perealloc(ZEND_MAP_PTR_REAL_BASE(CG(map_ptr_base)), CG(map_ptr_size) * sizeof(void*), 1));
-               memset(ZEND_MAP_PTR_REAL_BASE(CG(map_ptr_base)) + old_map_ptr_last, 0,
++              memset((void **) ZEND_MAP_PTR_REAL_BASE(CG(map_ptr_base)) + old_map_ptr_last, 0,
                        (CG(map_ptr_last) - old_map_ptr_last) * sizeof(void *));
        }
  }