mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 03:18:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: "popcount" name conflict on NetBSD #28983

Browse Source 
Problem:
    NetBSD's libc already has a function by the same name.

Solution:
    Rename popcount to xpopcount and add #if defined(__NetBSD__) to
prefer NetBSD's own implementation.  This fixes #28983.

(cherry picked from commit 104800ce2e)
This commit is contained in:
Malte Dehling
2024-05-27 04:14:57 -07:00
committed by github-actions[bot]
parent 8d1467ce9a
commit b322c3560b
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); unsigned count = (win != NULL) + (buf != NULL);
VALIDATE(popcount(opts->is_set__redraw_) > count, "%s", "at least one action required", { VALIDATE(xpopcount(opts->is_set__redraw_) > count, "%s", "at least one action required", {
return; 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. /// Count number of set bits in bit field.
int popcount(uint64_t x) unsigned xpopcount(uint64_t x)
{ {
// Use compiler builtin if possible. // Use compiler builtin if possible.
#if defined(__clang__) || defined(__GNUC__) #if defined(__NetBSD__)
return __builtin_popcountll(x); return popcount64(x);
#elif defined(__clang__) || defined(__GNUC__)
return (unsigned)__builtin_popcountll(x);
#else #else
int count = 0; unsigned count = 0;
for (; x != 0; x >>= 1) { for (; x != 0; x >>= 1) {
if (x & 1) { if (x & 1) {
count++; count++;