GitHub/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim synced 2025-07-16 09:11:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #29038 from neovim/backport-28983-to-release-0.10

Browse Source 
fix: "popcount" name conflict on NetBSD
This commit is contained in:
zeertzjq
2024-05-27 19:28:31 +08:00
committed by GitHub
parent 8d1467ce9a b322c3560b
commit b9e540cc70
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/api/vim.c
View File

@ -2384,8 +2384,8 @@ void nvim__redraw(Dict(redraw) *opts, Error *err)
}
}
int count = (win != NULL) + (buf != NULL);
VALIDATE(popcount(opts->is_set__redraw_) > count, "%s", "at least one action required", {
unsigned count = (win != NULL) + (buf != NULL);
VALIDATE(xpopcount(opts->is_set__redraw_) > count, "%s", "at least one action required", {
return;
});

10
src/nvim/math.c
View File

@ -78,13 +78,15 @@ int xctz(uint64_t x)
}
/// Count number of set bits in bit field.
int popcount(uint64_t x)
unsigned xpopcount(uint64_t x)
{
// Use compiler builtin if possible.
#if defined(__clang__) || defined(__GNUC__)
return __builtin_popcountll(x);
#if defined(__NetBSD__)
return popcount64(x);
#elif defined(__clang__) || defined(__GNUC__)
return (unsigned)__builtin_popcountll(x);
#else
int count = 0;
unsigned count = 0;
for (; x != 0; x >>= 1) {
if (x & 1) {
count++;