com php-src: Fix clang compilation: Zend/zend_cpuinfo.c Z end/zend_portability.h ext/standard/basic_functions.h ext/standard/net.c

From: Date: Wed, 01 Aug 2018 14:19:54 +0000
Subject: com php-src: Fix clang compilation: Zend/zend_cpuinfo.c Z end/zend_portability.h ext/standard/basic_functions.h ext/standard/net.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-102770@lists.php.net to get a copy of this message
Commit: 36857ab52b8cafc91650ccc55053abe6b517f092 Author: Anatol Belski <ab@php.net> Wed, 1 Aug 2018 16:19:54 +0200 Parents: b1d2a89ac1a2880bfe6125738bad061317d63b7b Branches: PHP-7.3 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=36857ab52b8cafc91650ccc55053abe6b517f092 Log: Fix clang compilation By usage of -fmodules, all the intrinsic items are loaded automatically. The headers included come however from Visual Studio, thus bringing some conflicting declarations. On the other hand, -fmodules is needed to mitigate linking issues with clang in VS compatibility mode. Changed paths: M Zend/zend_cpuinfo.c M Zend/zend_portability.h M ext/standard/basic_functions.h M ext/standard/net.c Diff: diff --git a/Zend/zend_cpuinfo.c b/Zend/zend_cpuinfo.c index 70e1dbf..39519c4 100644 --- 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 index 34d5a3d..296ffe7 100644 --- 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 index b8a9179..c9b03e7 100644 --- 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 index d1e78dc..23806ca 100644 --- 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>

« previous php.cvs (#102770) next »