mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 10:24:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix clang compilation

Browse Source 
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.
This commit is contained in:
Anatol Belski 2018-08-01 16:19:54 +02:00
parent b1d2a89ac1
commit 36857ab52b
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zend/zend_cpuinfo.c
View File

@ -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];

2
Zend/zend_portability.h
View File

@ -70,7 +70,7 @@
# include <alloca.h>
#endif
#if defined(ZEND_WIN32)
#if defined(ZEND_WIN32) && !defined(__clang__)
#include <intrin.h>
#endif

2
ext/standard/basic_functions.h
View File

@ -32,7 +32,7 @@
#include "url_scanner_ex.h"
#if defined(_WIN32) && defined(__clang__)
#if defined(_WIN32) && !defined(__clang__)
#include <intrin.h>
#endif

2
ext/standard/net.c
View File

@ -32,7 +32,9 @@
#endif
#ifdef PHP_WIN32
# ifndef __clang__
# include <intrin.h>
# endif
# include <winsock2.h>
# include <ws2ipdef.h>
# include <Ws2tcpip.h>