Use $(COPT2) instead of -O6.

[libucw.git] / lib / hashfunc.h

diff --git a/lib/hashfunc.h b/lib/hashfunc.h
index 2b2713ea8b19cc13b54b1bc4a165c9484def6d42..c10f224910d9ba563ef401adc45ae57db011912a 100644 (file)
--- a/lib/hashfunc.h
+++ b/lib/hashfunc.h
@@ -39,7 +39,8 @@ uns hash_string_nocase(const byte *str) CONST;
  *  of using shifts and adds on architectures where multiplication
  *  instructions are slow).
  */
-static inline uns CONST hash_int(uns x) { return 0x01008041*x; }
-static inline uns CONST hash_pointer(void *x) { return hash_int((uns)x); }
+static inline uns CONST hash_u32(uns x) { return 0x01008041*x; }
+static inline uns CONST hash_u64(u64 x) { return hash_u32((uns)x ^ (uns)(x >> 32)); }
+static inline uns CONST hash_pointer(void *x) { return ((sizeof(x) <= 4) ? hash_u32((uns)(addr_int_t)x) : hash_u64((u64)(addr_int_t)x)); }
 
 #endif