Merge lp:~tangent-org/libmemcached/1.0-build Build: jenkins-Libmemcached-1.0-115

[m6w6/libmemcached] / libhashkit / common.h

diff --git a/libhashkit/common.h b/libhashkit/common.h
index e840e46d80f34a83e1a938dcfdd707d22d1dd1f0..7affeb366a3f75ef138738f1ac82dbc36553cb63 100644 (file)
--- a/libhashkit/common.h
+++ b/libhashkit/common.h
@@ -37,7 +37,7 @@
 
 #pragma once
 
-#include <config.h>
+#include <mem_config.h>
 
 #include <assert.h>
 #include <errno.h>
@@ -45,17 +45,23 @@
 #include <stdlib.h>
 #include <math.h>
 
+#ifndef __WORDSIZE
+# ifdef __MINGW32__
+#  define __WORDSIZE 32
+# endif
+#endif
+
 #include <libhashkit-1.0/hashkit.h>
 #include <libhashkit/is.h>
+#include <libhashkit/string.h>
+#include <libhashkit/aes.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-HASHKIT_LOCAL
 void md5_signature(const unsigned char *key, unsigned int length, unsigned char *result);
 
-HASHKIT_LOCAL
 int update_continuum(hashkit_st *hashkit);
 
 #ifdef __cplusplus