From ae564275d9976555e1ad52d6b6dfa99bc86f21fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= <kevin@dunglas.fr>
Date: Tue, 6 Jan 2026 11:19:47 +0100
Subject: [PATCH 1/3] Zend/zend_call_stack.h: fix missing include on Windows
 (clang compat)

---
 Zend/zend_call_stack.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Zend/zend_call_stack.h b/Zend/zend_call_stack.h
index c8bc756426bf8..fd4933e347709 100644
--- a/Zend/zend_call_stack.h
+++ b/Zend/zend_call_stack.h
@@ -21,6 +21,9 @@
 
 #include "zend.h"
 #include "zend_portability.h"
+#ifdef ZEND_WIN32
+# include <intrin.h>
+#endif
 #ifdef __APPLE__
 # include <pthread.h>
 #endif

From 5f553a7b2f4747fe58d04f87dbc00263f4e9a3bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= <kevin@dunglas.fr>
Date: Tue, 6 Jan 2026 14:49:06 +0100
Subject: [PATCH 2/3] add News entry

---
 NEWS | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/NEWS b/NEWS
index fc4f5d3d2978c..25cd72ab0d1ec 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,10 @@ PHP                                                                        NEWS
   . Fixed bug #74357 (lchown fails to change ownership of symlink with ZTS)
     (Jakub Zelenka)
 
+- Windows:
+  . Fixed compilation with clang (missing intrin.h include)
+    (Kévin Dunglas)
+
 15 Jan 2026, PHP 8.4.17
 
 - Core:

From a149b272ebc34013eb0e775ed42634c6ebf72e14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= <kevin@dunglas.fr>
Date: Tue, 6 Jan 2026 12:31:08 +0100
Subject: [PATCH 3/3] Update zend_call_stack.h
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Tim Düsterhus <timwolla@googlemail.com>
---
 NEWS                   | 2 +-
 Zend/zend_call_stack.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 25cd72ab0d1ec..3f814458559a4 100644
--- a/NEWS
+++ b/NEWS
@@ -15,7 +15,7 @@ PHP                                                                        NEWS
     (Jakub Zelenka)
 
 - Windows:
-  . Fixed compilation with clang (missing intrin.h include)
+  . Fixed compilation with clang (missing intrin.h include).
     (Kévin Dunglas)
 
 15 Jan 2026, PHP 8.4.17
diff --git a/Zend/zend_call_stack.h b/Zend/zend_call_stack.h
index fd4933e347709..566634deeb68a 100644
--- a/Zend/zend_call_stack.h
+++ b/Zend/zend_call_stack.h
@@ -21,7 +21,7 @@
 
 #include "zend.h"
 #include "zend_portability.h"
-#ifdef ZEND_WIN32
+#ifdef _MSC_VER
 # include <intrin.h>
 #endif
 #ifdef __APPLE__