diff options
| author | Nikita Popov <nikic@php.net> | 2016-12-14 17:57:21 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-12-14 17:57:21 +0100 |
| commit | 61e7e7c5bd975cffd9e317d92d58ce02ff11d0c2 (patch) | |
| tree | a6eb75e0ca92db9504e338d1a74ea46fc8704d9f | |
| parent | c76bd41c77892ef51d79a2bb6a1634872cf4db6f (diff) | |
| parent | 2f438342ecef4efd207becddf9cea46d0d3a2f00 (diff) | |
| download | php-git-61e7e7c5bd975cffd9e317d92d58ce02ff11d0c2.tar.gz | |
Merge branch 'PHP-7.1'
| -rw-r--r-- | Zend/zend_bitset.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_bitset.h b/Zend/zend_bitset.h index 12c58b1a41..c909887b08 100644 --- a/Zend/zend_bitset.h +++ b/Zend/zend_bitset.h @@ -56,14 +56,14 @@ static zend_always_inline int zend_ulong_ntz(zend_ulong num) if (!BitScanForward(&index, num)) { #endif /* undefined behavior */ - return 32; + return SIZEOF_ZEND_LONG * 8; } return (int) index; #else int n; - if (num == Z_UL(0)) return ZEND_MM_BITSET_LEN; + if (num == Z_UL(0)) return SIZEOF_ZEND_LONG * 8; n = 1; #if SIZEOF_ZEND_LONG == 8 |