summaryrefslogtreecommitdiff
path: root/src/utils.h
diff options
context:
space:
mode:
authorRan Benita <ran234@gmail.com>2016-11-14 17:37:35 +0200
committerRan Benita <ran234@gmail.com>2016-11-14 17:37:35 +0200
commit327364d277609600aa19aabd6dc55f2fc7dfb8cf (patch)
tree2918de989b18a14a6cd40c2888017840ca00ba64 /src/utils.h
parentd596f6e3ff2d1fde0491907fa9354e5cdf154ed1 (diff)
downloadxorg-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/utils.h')
-rw-r--r--src/utils.h3
1 files changed, 2 insertions, 1 deletions
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)