31 lines
831 B
Plaintext
31 lines
831 B
Plaintext
$NetBSD: patch-standard_h,v 1.1 2014/07/14 15:30:10 fhajny Exp $
|
|
|
|
Remove local version of popcount(3), conflicts w/ libc.
|
|
|
|
--- include/common/standard.h.orig 2014-07-12 14:40:52.000000000 +0000
|
|
+++ include/common/standard.h
|
|
@@ -24,6 +24,7 @@
|
|
|
|
#include <limits.h>
|
|
#include <string.h>
|
|
+#include <strings.h>
|
|
#include <time.h>
|
|
#include <sys/types.h>
|
|
#include <sys/socket.h>
|
|
@@ -565,6 +566,7 @@ static inline unsigned int div64_32(unsi
|
|
return result;
|
|
}
|
|
|
|
+#if !defined(__NetBSD__)
|
|
/* Simple popcount implementation. It returns the number of ones in a word */
|
|
static inline unsigned int popcount(unsigned long a)
|
|
{
|
|
@@ -575,6 +577,7 @@ static inline unsigned int popcount(unsi
|
|
}
|
|
return cnt;
|
|
}
|
|
+#endif
|
|
|
|
/* Build a word with the <bits> lower bits set (reverse of popcount) */
|
|
static inline unsigned long nbits(int bits)
|