projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge in all current libmemcached work, plus restore older, working,
[awesomized/libmemcached]
/
libhashkit
/
algorithm.c
diff --git
a/libhashkit/algorithm.c
b/libhashkit/algorithm.c
index 380950e96dd81c736a330b1fd607cb634a4bc07b..de00081da56c648246fdb2a7f99a72ef93b6a514 100644
(file)
--- a/
libhashkit/algorithm.c
+++ b/
libhashkit/algorithm.c
@@
-6,7
+6,7
@@
* the COPYING file in the parent directory for full text.
*/
* the COPYING file in the parent directory for full text.
*/
-#include
"common.h"
+#include
<libhashkit/common.h>
uint32_t libhashkit_one_at_a_time(const char *key, size_t key_length)
{
uint32_t libhashkit_one_at_a_time(const char *key, size_t key_length)
{
@@
-45,10
+45,12
@@
uint32_t libhashkit_hsieh(const char *key, size_t key_length)
}
#endif
}
#endif
+#ifdef HAVE_MURMUR_HASH
uint32_t libhashkit_murmur(const char *key, size_t key_length)
{
return hashkit_murmur(key, key_length, NULL);
}
uint32_t libhashkit_murmur(const char *key, size_t key_length)
{
return hashkit_murmur(key, key_length, NULL);
}
+#endif
uint32_t libhashkit_jenkins(const char *key, size_t key_length)
{
uint32_t libhashkit_jenkins(const char *key, size_t key_length)
{
@@
-60,8
+62,8
@@
uint32_t libhashkit_md5(const char *key, size_t key_length)
return hashkit_md5(key, key_length, NULL);
}
return hashkit_md5(key, key_length, NULL);
}
-void libhashkit_md5_signature(const unsigned char *key,
uint32
_t length, unsigned char *result)
+void libhashkit_md5_signature(const unsigned char *key,
size
_t length, unsigned char *result)
{
{
- md5_signature(key, length, result);
+ md5_signature(key,
(uint32_t)
length, result);
}
}