Merge with 3.8 (my small changes due to trying to release the free version)

[libucw.git] / lib / hash-test.c

diff --git a/lib/hash-test.c b/lib/hash-test.c
index af4c7154d1f911705b0d5b74d2626c1c970f2134..1b5ee45cb0067dcc8a9f4adb16bc8c2081635728 100644 (file)
--- a/lib/hash-test.c
+++ b/lib/hash-test.c
@@ -17,6 +17,7 @@ struct node1 {
 #define HASH_PREFIX(x) test1_##x
 #define HASH_KEY_ATOMIC key
 #define HASH_ATOMIC_TYPE int
+#define HASH_ZERO_FILL
 
 #define HASH_GIVE_INIT_DATA
 static inline void test1_init_data(struct node1 *n)
@@ -171,7 +172,7 @@ struct node4 {
 #define HASH_GIVE_HASHFN
 static uns test4_hash(char *host, int port)
 {
-  return hash_string_nocase(host) ^ hash_int(port);
+  return hash_string_nocase(host) ^ hash_u32(port);
 }
 
 #define HASH_GIVE_EQ