Merge branch 'PHP-7.2' into PHP-7.3

diff --cc Zend/zend_alloc.c
index 0039228d5100745b81c970f07a3063b3975c0498,3744a83c84e46adc54b1f3ad71a7ebf9353ecb2d..11f5b46bd9559bccf0e61e96b41529be19f200e8
--- 1/Zend/zend_alloc.c
--- 2/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@@ -2668,12 -2602,10 +2670,10 @@@ ZEND_API void shutdown_memory_manager(i
  
  static void alloc_globals_ctor(zend_alloc_globals *alloc_globals)
  {
- #if ZEND_MM_CUSTOM || MAP_HUGETLB
        char *tmp;
- #endif
 +
  #if ZEND_MM_CUSTOM
        tmp = getenv("USE_ZEND_ALLOC");
 -
        if (tmp && !zend_atoi(tmp, 0)) {
                alloc_globals->mm_heap = malloc(sizeof(zend_mm_heap));
                memset(alloc_globals->mm_heap, 0, sizeof(zend_mm_heap));
@@@ -2684,7 -2616,6 +2684,7 @@@
                return;
        }
  #endif
- #ifdef MAP_HUGETLB
++
        tmp = getenv("USE_ZEND_ALLOC_HUGE_PAGES");
        if (tmp && zend_atoi(tmp, 0)) {
                zend_mm_use_huge_pages = 1;