oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

roken: don't call assert() before variable decl

Browse Source
This commit is contained in:
Luke Howard
2021-12-22 13:43:17 +11:00
parent 8590499b53
commit 9aa67e58ba
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/roken/clz.c
View File

@@ -30,10 +30,15 @@
ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
rk_clzll(uint64_t x) rk_clzll(uint64_t x)
{ {
#if defined(_MSC_VER)
unsigned long r = 0;
#elif !(defined(__GNUC__) && __GNUC__ >= 4)
int r = 0;
#endif
assert(x != 0); assert(x != 0);
#if defined(_MSC_VER) #if defined(_MSC_VER)
unsigned long r = 0;
# if defined(_WIN64) # if defined(_WIN64)
_BitScanReverse64(&r, x); _BitScanReverse64(&r, x);
# else # else
@@ -46,7 +51,6 @@ rk_clzll(uint64_t x)
#elif (defined(__GNUC__) && __GNUC__ >= 4) #elif (defined(__GNUC__) && __GNUC__ >= 4)
return __builtin_clzll(x); return __builtin_clzll(x);
#else #else
int r = 0;
while (!(x & ((uint64_t)1 << 63))) { while (!(x & ((uint64_t)1 << 63))) {
x <<= 1; x <<= 1;
++r; ++r;