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 fixes for deprecated bits in behavior.
[awesomized/libmemcached]
/
libhashkit
/
function.c
diff --git
a/libhashkit/function.c
b/libhashkit/function.c
index 25c929bd84794a9cba635b9b8cd053a50b912fce..3560abd7ef273f7c0dcbeb0194a089b63bb07c05 100644
(file)
--- a/
libhashkit/function.c
+++ b/
libhashkit/function.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>
static hashkit_return_t _set_function(struct hashkit_function_st *self, hashkit_hash_algorithm_t hash_algorithm)
{
static hashkit_return_t _set_function(struct hashkit_function_st *self, hashkit_hash_algorithm_t hash_algorithm)
{
@@
-41,15
+41,20
@@
static hashkit_return_t _set_function(struct hashkit_function_st *self, hashkit_
return HASHKIT_FAILURE;
#endif
case HASHKIT_HASH_MURMUR:
return HASHKIT_FAILURE;
#endif
case HASHKIT_HASH_MURMUR:
+#ifdef HAVE_MURMUR_HASH
self->function= hashkit_murmur;
break;
self->function= hashkit_murmur;
break;
+#else
+ return HASHKIT_FAILURE;
+#endif
case HASHKIT_HASH_JENKINS:
self->function= hashkit_jenkins;
break;
case HASHKIT_HASH_CUSTOM:
case HASHKIT_HASH_JENKINS:
self->function= hashkit_jenkins;
break;
case HASHKIT_HASH_CUSTOM:
+ return HASHKIT_INVALID_ARGUMENT;
case HASHKIT_HASH_MAX:
default:
case HASHKIT_HASH_MAX:
default:
- return HASHKIT_
FAILURE
;
+ return HASHKIT_
INVALID_HASH
;
}
self->context= NULL;
}
self->context= NULL;
@@
-126,10
+131,12
@@
static hashkit_hash_algorithm_t get_function_type(const hashkit_hash_fn function
return HASHKIT_HASH_HSIEH;
}
#endif
return HASHKIT_HASH_HSIEH;
}
#endif
+#ifdef HAVE_MURMUR_HASH
else if (function == hashkit_murmur)
{
return HASHKIT_HASH_MURMUR;
}
else if (function == hashkit_murmur)
{
return HASHKIT_HASH_MURMUR;
}
+#endif
else if (function == hashkit_jenkins)
{
return HASHKIT_HASH_JENKINS;
else if (function == hashkit_jenkins)
{
return HASHKIT_HASH_JENKINS;