caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #692 from davidcorrigan714/patch-1

Browse Source 
Fix variable name in bits.h for MSVC builds
This commit is contained in:
gatecat 2021-05-01 10:25:00 +01:00 committed by GitHub
commit ed17091e6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/bits.h
View File

@ -51,7 +51,7 @@ struct Bits
#if defined(__GNUC__) || defined(__clang__) #if defined(__GNUC__) || defined(__clang__)
return __builtin_popcount(x); return __builtin_popcount(x);
#elif defined(_MSC_VER) && (defined(_M_X64) || defined(_M_IX86)) #elif defined(_MSC_VER) && (defined(_M_X64) || defined(_M_IX86))
return __popcnt(v); return __popcnt(x);
#else #else
return generic_popcount(x); return generic_popcount(x);
#endif #endif
@ -63,7 +63,7 @@ struct Bits
return __builtin_ctz(x); return __builtin_ctz(x);
#elif defined(_MSC_VER) && (defined(_M_X64) || defined(_M_IX86)) #elif defined(_MSC_VER) && (defined(_M_X64) || defined(_M_IX86))
unsigned long result; unsigned long result;
_BitScanForward(&result, v); _BitScanForward(&result, x);
return result; return result;
#else #else
return generic_ctz(x); return generic_ctz(x);