diff options
| author | Popa Adrian Marius <mapopa@gmail.com> | 2015-12-03 16:24:24 +0200 |
|---|---|---|
| committer | Popa Adrian Marius <mapopa@gmail.com> | 2015-12-03 16:24:24 +0200 |
| commit | 337fd3ad64007265b24f479060279b68b604e92c (patch) | |
| tree | 50e29d61e278d36d72f3faa64e4fab1ad8a615b4 /Zend/zend_alloc.c | |
| parent | 1745ead668a16f9f15abdbca971aaf9fb3e80946 (diff) | |
| parent | 3d6dd2a27bc3159d1f8db5eca1ca32e90733c30f (diff) | |
| download | php-git-337fd3ad64007265b24f479060279b68b604e92c.tar.gz | |
Merge branch 'PHP-7.0' of https://git.php.net/push/php-src into PHP-7.0
* 'PHP-7.0' of https://git.php.net/push/php-src:
NEWS for 8907da99b83204958cb2308ec12aa9e490372150
Fixed bug #71006 (symbol referencing errors on Sparc/Solaris)
remove PHP 5 NEWS entries
Diffstat (limited to 'Zend/zend_alloc.c')
| -rw-r--r-- | Zend/zend_alloc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index c9d4de43a4..6b335d2918 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -506,9 +506,9 @@ static void zend_mm_munmap(void *addr, size_t size) /* number of trailing set (1) bits */ static zend_always_inline int zend_mm_bitset_nts(zend_mm_bitset bitset) { -#if (defined(__GNUC__) || __has_builtin(__builtin_ctzl)) && SIZEOF_ZEND_LONG == SIZEOF_LONG +#if (defined(__GNUC__) || __has_builtin(__builtin_ctzl)) && SIZEOF_ZEND_LONG == SIZEOF_LONG && defined(PHP_HAVE_BUILTIN_CTZL) return __builtin_ctzl(~bitset); -#elif defined(__GNUC__) || __has_builtin(__builtin_ctzll) +#elif (defined(__GNUC__) || __has_builtin(__builtin_ctzll)) && defined(PHP_HAVE_BUILTIN_CTZLL) return __builtin_ctzll(~bitset); #elif defined(_WIN32) unsigned long index; @@ -545,9 +545,9 @@ static zend_always_inline int zend_mm_bitset_nts(zend_mm_bitset bitset) /* number of trailing zero bits (0x01 -> 1; 0x40 -> 6; 0x00 -> LEN) */ static zend_always_inline int zend_mm_bitset_ntz(zend_mm_bitset bitset) { -#if (defined(__GNUC__) || __has_builtin(__builtin_ctzl)) && SIZEOF_ZEND_LONG == SIZEOF_LONG +#if (defined(__GNUC__) || __has_builtin(__builtin_ctzl)) && SIZEOF_ZEND_LONG == SIZEOF_LONG && defined(PHP_HAVE_BUILTIN_CTZL) return __builtin_ctzl(bitset); -#elif defined(__GNUC__) || __has_builtin(__builtin_ctzll) +#elif (defined(__GNUC__) || __has_builtin(__builtin_ctzll)) && defined(PHP_HAVE_BUILTIN_CTZLL) return __builtin_ctzll(bitset); #elif defined(_WIN32) unsigned long index; @@ -1161,7 +1161,7 @@ static zend_always_inline void zend_mm_free_large(zend_mm_heap *heap, zend_mm_ch /* higher set bit number (0->N/A, 1->1, 2->2, 4->3, 8->4, 127->7, 128->8 etc) */ static zend_always_inline int zend_mm_small_size_to_bit(int size) { -#if defined(__GNUC__) || __has_builtin(__builtin_clz) +#if (defined(__GNUC__) || __has_builtin(__builtin_clz)) && defined(PHP_HAVE_BUILTIN_CLZ) return (__builtin_clz(size) ^ 0x1f) + 1; #elif defined(_WIN32) unsigned long index; |