diff options
| author | gatecat <gatecat@ds0.me> | 2021-05-01 10:25:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-01 10:25:00 +0100 |
| commit | ed17091e6ada98a55396186a22c748abf3fca310 (patch) | |
| tree | c7f587490e716a562279bb36724df412bd464a53 | |
| parent | 4bdf4582f0778d4a24fa188699c7e1696d0dee31 (diff) | |
| parent | f5c2547952889bc9cbc64a058a2bb4354f6115a0 (diff) | |
| download | nextpnr-ed17091e6ada98a55396186a22c748abf3fca310.tar.gz nextpnr-ed17091e6ada98a55396186a22c748abf3fca310.tar.bz2 nextpnr-ed17091e6ada98a55396186a22c748abf3fca310.zip | |
Merge pull request #692 from davidcorrigan714/patch-1
Fix variable name in bits.h for MSVC builds
| -rw-r--r-- | common/bits.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/bits.h b/common/bits.h index 1d6bb8be..04b25b74 100644 --- a/common/bits.h +++ b/common/bits.h @@ -51,7 +51,7 @@ struct Bits #if defined(__GNUC__) || defined(__clang__) return __builtin_popcount(x); #elif defined(_MSC_VER) && (defined(_M_X64) || defined(_M_IX86)) - return __popcnt(v); + return __popcnt(x); #else return generic_popcount(x); #endif @@ -63,7 +63,7 @@ struct Bits return __builtin_ctz(x); #elif defined(_MSC_VER) && (defined(_M_X64) || defined(_M_IX86)) unsigned long result; - _BitScanForward(&result, v); + _BitScanForward(&result, x); return result; #else return generic_ctz(x); |