From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 28 Feb 2020 13:49:03 +0000 (+0100)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bb85478bcc58976d2390a2bb22ab30f13067cf41;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Try to fix msvc build
---

bb85478bcc58976d2390a2bb22ab30f13067cf41
diff --cc ext/opcache/ZendAccelerator.c
index 7aaaa6d030,758f8fc4bf..fb3a725b85
--- a/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 *));
  	}
  }