summaryrefslogtreecommitdiff
path: root/c
diff options
context:
space:
mode:
authorSamuel Neves <sneves@dei.uc.pt>2020-01-23 11:51:46 +0000
committerSamuel Neves <sneves@dei.uc.pt>2020-01-23 11:51:46 +0000
commitde1458c565aad524386781793e33d64d45577368 (patch)
tree2bd36ca49d37bbf44efa3a6c74ab71df80f59e4b /c
parent37ea737c16b5e0ad2909906e9e48856fd2e24f34 (diff)
name collision
Diffstat (limited to 'c')
-rw-r--r--c/blake3_impl.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/c/blake3_impl.h b/c/blake3_impl.h
index 84caae9..269dd67 100644
--- a/c/blake3_impl.h
+++ b/c/blake3_impl.h
@@ -77,7 +77,7 @@ static const uint8_t MSG_SCHEDULE[7][16] = {
/* Find index of the highest set bit */
/* x is assumed to be nonzero. */
-static unsigned int fls(uint64_t x) {
+static unsigned int highest_one(uint64_t x) {
#if defined(__GNUC__) || defined(__clang__)
return 63 ^ __builtin_clzll(x);
#elif defined(_MSC_VER) && defined(IS_X86_64)
@@ -123,7 +123,7 @@ INLINE unsigned int popcnt(uint64_t x) {
// Largest power of two less than or equal to x. As a special case, returns 1
// when x is 0.
INLINE uint64_t round_down_to_power_of_2(uint64_t x) {
- return 1ULL << fls(x | 1);
+ return 1ULL << highest_one(x | 1);
}
INLINE uint32_t counter_low(uint64_t counter) { return (uint32_t)counter; }