diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-07-01 09:44:53 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-07-01 09:44:53 +0200 |
| commit | e73cc44021a6549b0382bda90a0f4274c1722b24 (patch) | |
| tree | ab26d1ad78fe9604bd74af6e86dad669042e5085 /Zend/zend_cpuinfo.h | |
| parent | a0cbc9a7b9e1fe39ccddd85bc19a571d14986680 (diff) | |
| parent | 5c0a9a4096081b7256dcf5410cce2ae03ffbe041 (diff) | |
| download | php-git-e73cc44021a6549b0382bda90a0f4274c1722b24.tar.gz | |
Merge branch 'PHP-7.4'
Diffstat (limited to 'Zend/zend_cpuinfo.h')
| -rw-r--r-- | Zend/zend_cpuinfo.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Zend/zend_cpuinfo.h b/Zend/zend_cpuinfo.h index 8b84193f17..0b6b54e51a 100644 --- a/Zend/zend_cpuinfo.h +++ b/Zend/zend_cpuinfo.h @@ -103,9 +103,6 @@ ZEND_API int zend_cpu_supports(zend_cpu_feature feature); #ifndef __has_attribute # define __has_attribute(x) 0 #endif -#ifndef __has_feature -# define __has_feature(x) 0 -#endif /* Address sanitizer is incompatible with ifunc resolvers, so exclude the * CPU support helpers from asan. |