diff options
author | Aron Xu <aron@debian.org> | 2015-09-21 22:58:06 +0800 |
---|---|---|
committer | Aron Xu <aron@debian.org> | 2015-09-21 22:58:06 +0800 |
commit | 2ee13d9e464a1f5daccaff58f5d09d36b7c4f667 (patch) | |
tree | b022967f880b7fb1e56c8cc4c3f200d6ffbc9efd /timsort.h | |
parent | 7300193becde71a344c8ac0973dc290fa24d800d (diff) | |
download | libxml2-upstream.tar.gz |
Revert "Imported Upstream version 2.9.1+dfsg1"upstream
This reverts commit 7300193becde71a344c8ac0973dc290fa24d800d.
Diffstat (limited to 'timsort.h')
-rw-r--r-- | timsort.h | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -61,12 +61,12 @@ int clzll(uint64_t x) /* {{{ */ if (x == 0) return(64); n = 0; - if (x <= 0x00000000FFFFFFFFL) {n = n + 32; x = x << 32;} - if (x <= 0x0000FFFFFFFFFFFFL) {n = n + 16; x = x << 16;} - if (x <= 0x00FFFFFFFFFFFFFFL) {n = n + 8; x = x << 8;} - if (x <= 0x0FFFFFFFFFFFFFFFL) {n = n + 4; x = x << 4;} - if (x <= 0x3FFFFFFFFFFFFFFFL) {n = n + 2; x = x << 2;} - if (x <= 0x7FFFFFFFFFFFFFFFL) {n = n + 1;} + if (x <= MK_UINT64(0x00000000FFFFFFFF)) {n = n + 32; x = x << 32;} + if (x <= MK_UINT64(0x0000FFFFFFFFFFFF)) {n = n + 16; x = x << 16;} + if (x <= MK_UINT64(0x00FFFFFFFFFFFFFF)) {n = n + 8; x = x << 8;} + if (x <= MK_UINT64(0x0FFFFFFFFFFFFFFF)) {n = n + 4; x = x << 4;} + if (x <= MK_UINT64(0x3FFFFFFFFFFFFFFF)) {n = n + 2; x = x << 2;} + if (x <= MK_UINT64(0x7FFFFFFFFFFFFFFF)) {n = n + 1;} return n; } /* }}} */ |