fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-23 02:50:50 +00:00
Code Issues Projects Releases Wiki Activity

rename popcount to popcount_binary to avoid a conflict with NetBSD libc

Browse Source 
NetBSD-current's libc has a function named popcount.
hiding these extensions using feature macros is not possible because
redis uses other extensions covered by the same feature macro.
eg. inet_aton
This commit is contained in:
YAMAMOTO Takashi 2012-07-19 21:28:11 +09:00
parent 0a20ad40de
commit b2dd0849ce
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bitops.c
View File

@ -58,7 +58,7 @@ static int getBitOffsetFromArgument(redisClient *c, robj *o, size_t *offset) {
/* Count number of bits set in the binary array pointed by 's' and long
* 'count' bytes. The implementation of this function is required to
* work with a input string length up to 512 MB. */
size_t popcount(void *s, long count) {
size_t popcount_binary(void *s, long count) {
size_t bits = 0;
unsigned char *p;
uint32_t *p4 = s;
@ -407,6 +407,6 @@ void bitcountCommand(redisClient *c) {
} else {
long bytes = end-start+1;
addReplyLongLong(c,popcount(p+start,bytes));
addReplyLongLong(c,popcount_binary(p+start,bytes));
}
}

2
src/redis.h
View File

@ -1010,7 +1010,7 @@ long long mstime(void);
void getRandomHexChars(char *p, unsigned int len);
uint64_t crc64(uint64_t crc, const unsigned char *s, uint64_t l);
void exitFromChild(int retcode);
size_t popcount(void *s, long count);
size_t popcount_binary(void *s, long count);
void redisSetProcTitle(char *title);
/* networking.c -- Networking and Client related operations */