Merge branch 'PHP-8.3' into PHP-8.4

ndossche · ndossche · commit 976143e36572 · 2025-06-05T21:51:38.000+02:00
* PHP-8.3:
  Fix compile without ZEND_MM_STORAGE
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
@@ -3193,7 +3193,7 @@ ZEND_API zend_mm_storage *zend_mm_get_storage(zend_mm_heap *heap)
 #if ZEND_MM_STORAGE
 	return heap->storage;
 #else
-	return NULL
+	return NULL;
 #endif
 }
 

Original file line number	Diff line number	Diff line change
`@@ -3193,7 +3193,7 @@ ZEND_API zend_mm_storage zend_mm_get_storage(zend_mm_heap heap)`
`3193`	`3193`	`#if ZEND_MM_STORAGE`
`3194`	`3194`	`return heap->storage;`
`3195`	`3195`	`#else`
`3196`		`- return NULL`
	`3196`	`+ return NULL;`
`3197`	`3197`	`#endif`
`3198`	`3198`	`}`
`3199`	`3199`