diff options
| author | Anatol Belski <ab@php.net> | 2018-08-01 16:24:07 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2018-08-01 16:24:07 +0200 |
| commit | 2d71a28954a4f20709718ee7cb2b850d334c561c (patch) | |
| tree | a1ec6992b7643128db95e671bf6c127584e988c2 /ext | |
| parent | 85145e509e6a779621d9fd8f99b0e16f3e26ca1f (diff) | |
| parent | 36857ab52b8cafc91650ccc55053abe6b517f092 (diff) | |
| download | php-git-2d71a28954a4f20709718ee7cb2b850d334c561c.tar.gz | |
Merge branch 'PHP-7.3'
* PHP-7.3:
Fix clang compilation
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/standard/basic_functions.h | 2 | ||||
| -rw-r--r-- | ext/standard/net.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/ext/standard/basic_functions.h b/ext/standard/basic_functions.h index b8a917920f..c9b03e7a10 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 d1e78dcc7a..23806cabf8 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> |