Merge for 0.53 release

[m6w6/libmemcached] / libhashkit / algorithm.h

diff --git a/libhashkit/algorithm.h b/libhashkit/algorithm.h
index 465d0b5d3ff9fe4aa4aaf8590029bea9276085d2..fa5f3ae5dacc61c4255a7d0af328d807b2af8175 100644 (file)
--- a/libhashkit/algorithm.h
+++ b/libhashkit/algorithm.h
@@ -11,8 +11,7 @@
  * @brief HashKit Header
  */
 
-#ifndef HASHKIT_ALGORITHM_H
-#define HASHKIT_ALGORITHM_H
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -36,10 +35,8 @@ 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
 
 HASHKIT_API
 uint32_t libhashkit_murmur(const char *key, size_t key_length);
@@ -68,10 +65,8 @@ 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
 
 HASHKIT_LOCAL
 uint32_t hashkit_murmur(const char *key, size_t key_length, void *context);
@@ -82,8 +77,9 @@ uint32_t hashkit_jenkins(const char *key, size_t key_length, void *context);
 HASHKIT_LOCAL
 uint32_t hashkit_md5(const char *key, size_t key_length, void *context);
 
+HASHKIT_API
+void libhashkit_md5_signature(const unsigned char *key, size_t length, unsigned char *result);
+
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* HASHKIT_ALGORITHM_H */