Merge branch 'PHP-7.3'

weltling · weltling · commit 2d71a28954a4 · 2018-08-01T16:24:07.000+02:00
* PHP-7.3:
  Fix clang compilation
diff --git a/Zend/zend_cpuinfo.c b/Zend/zend_cpuinfo.c
@@ -33,7 +33,7 @@ static zend_cpu_info cpuinfo = {0};
 static void __zend_cpuid(uint32_t func, uint32_t subfunc, zend_cpu_info *cpuinfo) {
 	__cpuid_count(func, subfunc, cpuinfo->eax, cpuinfo->ebx, cpuinfo->ecx, cpuinfo->edx);
 }
-#elif defined(ZEND_WIN32)
+#elif defined(ZEND_WIN32) && !defined(__clang__)
 # include <intrin.h>
 static void __zend_cpuid(uint32_t func, uint32_t subfunc, zend_cpu_info *cpuinfo) {
 	int regs[4];
diff --git a/Zend/zend_portability.h b/Zend/zend_portability.h
@@ -70,7 +70,7 @@
 # include <alloca.h>
 #endif
 
-#if defined(ZEND_WIN32)
+#if defined(ZEND_WIN32) && !defined(__clang__)
 #include <intrin.h>
 #endif
 
diff --git a/ext/standard/basic_functions.h b/ext/standard/basic_functions.h
@@ -32,7 +32,7 @@
 
 #include "url_scanner_ex.h"
 
-#if defined(_WIN32) && defined(__clang__)
+#if defined(_WIN32) && !defined(__clang__)
 #include <intrin.h>
 #endif
 
diff --git a/ext/standard/net.c b/ext/standard/net.c
@@ -32,7 +32,9 @@
 #endif
 
 #ifdef PHP_WIN32
+# ifndef __clang__
 # include <intrin.h>
+# endif
 # include <winsock2.h>
 # include <ws2ipdef.h>
 # include <Ws2tcpip.h>

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ static zend_cpu_info cpuinfo = {0};`
`33`	`33`	`static void __zend_cpuid(uint32_t func, uint32_t subfunc, zend_cpu_info *cpuinfo) {`
`34`	`34`	`__cpuid_count(func, subfunc, cpuinfo->eax, cpuinfo->ebx, cpuinfo->ecx, cpuinfo->edx);`
`35`	`35`	`}`
`36`		`-#elif defined(ZEND_WIN32)`
	`36`	`+#elif defined(ZEND_WIN32) && !defined(__clang__)`
`37`	`37`	`# include <intrin.h>`
`38`	`38`	`static void __zend_cpuid(uint32_t func, uint32_t subfunc, zend_cpu_info *cpuinfo) {`
`39`	`39`	`int regs[4];`