Merge branch 'PHP-8.4' into PHP-8.5

TimWolla · TimWolla · commit 59433f8d3e6b · 2026-01-29T10:38:52.000+01:00
* PHP-8.4: Zend/zend_call_stack.h: fix missing include on Windows (clang compat) (#20847)
diff --git a/NEWS b/NEWS
@@ -5,6 +5,9 @@ PHP                                                                        NEWS
 - Core:
   . Fixed bug GH-21029 (zend_mm_heap corrupted on Aarch64, LTO builds). (Arnaud)
 
+- Windows:
+  . Fixed compilation with clang (missing intrin.h include). (Kévin Dunglas)
+
 29 Jan 2026, PHP 8.5.3
 
 - Core:
diff --git a/Zend/zend_call_stack.h b/Zend/zend_call_stack.h
@@ -21,6 +21,9 @@
 
 #include "zend.h"
 #include "zend_portability.h"
+#ifdef _MSC_VER
+# include <intrin.h>
+#endif
 #ifdef __APPLE__
 # include <pthread.h>
 #endif
