diff options
| author | Ran Benita <ran234@gmail.com> | 2016-11-14 17:37:35 +0200 |
|---|---|---|
| committer | Ran Benita <ran234@gmail.com> | 2016-11-14 17:37:35 +0200 |
| commit | 327364d277609600aa19aabd6dc55f2fc7dfb8cf (patch) | |
| tree | 2918de989b18a14a6cd40c2888017840ca00ba64 /src | |
| parent | d596f6e3ff2d1fde0491907fa9354e5cdf154ed1 (diff) | |
| download | xorg-lib-libxkbcommon-327364d277609600aa19aabd6dc55f2fc7dfb8cf.tar.gz | |
utils: rename popcount to avoid conflict in NetBSD
Resolves https://github.com/xkbcommon/libxkbcommon/issues/41
Signed-off-by: Ran Benita <ran234@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/state.c | 2 | ||||
| -rw-r--r-- | src/utils.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/state.c b/src/state.c index 039115a..00495f7 100644 --- a/src/state.c +++ b/src/state.c @@ -1359,7 +1359,7 @@ key_get_consumed(struct xkb_state *state, const struct xkb_key *key, if (XkbLevelsSameSyms(level, no_mods_level)) continue; - if (entry == matching_entry || popcount(entry->mods.mask) == 1) + if (entry == matching_entry || my_popcount(entry->mods.mask) == 1) consumed |= entry->mods.mask & ~entry->preserve.mask; } break; diff --git a/src/utils.h b/src/utils.h index 11ef735..d63d23a 100644 --- a/src/utils.h +++ b/src/utils.h @@ -178,8 +178,9 @@ msb_pos(uint32_t mask) return pos; } +// Avoid conflict with other popcount()s. static inline int -popcount(uint32_t x) +my_popcount(uint32_t x) { int count; #if defined(HAVE___BUILTIN_POPCOUNT) |