Merge for 0.53 release

[m6w6/libmemcached] / libhashkit / algorithm.h

diff --git a/libhashkit/algorithm.h b/libhashkit/algorithm.h
index 58b40bc3cbeef2344b85b0dcfc910adf68d549f1..fa5f3ae5dacc61c4255a7d0af328d807b2af8175 100644 (file)
--- a/libhashkit/algorithm.h
+++ b/libhashkit/algorithm.h
@@ -35,15 +35,11 @@ uint32_t libhashkit_fnv1a_32(const char *key, size_t key_length);
 HASHKIT_API
 uint32_t libhashkit_crc32(const char *key, size_t key_length);
 
-#ifdef HAVE_HSIEH_HASH
 HASHKIT_API
 uint32_t libhashkit_hsieh(const char *key, size_t key_length);
-#endif
 
-#ifdef HAVE_MURMUR_HASH
 HASHKIT_API
 uint32_t libhashkit_murmur(const char *key, size_t key_length);
-#endif
 
 HASHKIT_API
 uint32_t libhashkit_jenkins(const char *key, size_t key_length);
@@ -69,15 +65,11 @@ uint32_t hashkit_fnv1a_32(const char *key, size_t key_length, void *context);
 HASHKIT_LOCAL
 uint32_t hashkit_crc32(const char *key, size_t key_length, void *context);
 
-#ifdef HAVE_HSIEH_HASH
 HASHKIT_LOCAL
 uint32_t hashkit_hsieh(const char *key, size_t key_length, void *context);
-#endif
 
-#ifdef HAVE_MURMUR_HASH
 HASHKIT_LOCAL
 uint32_t hashkit_murmur(const char *key, size_t key_length, void *context);
-#endif
 
 HASHKIT_LOCAL
 uint32_t hashkit_jenkins(const char *key, size_t key_length, void *context);