Use $(COPT2) instead of -O6.

[libucw.git] / lib / hashfunc.h

diff --git a/lib/hashfunc.h b/lib/hashfunc.h
index cc799476a87938e6349e786c6b6f4d72de9c2df1..c10f224910d9ba563ef401adc45ae57db011912a 100644 (file)
--- a/lib/hashfunc.h
+++ b/lib/hashfunc.h
@@ -1,6 +1,6 @@
 /*
- *     Hyper-super-meta-alt-control-shift extra fast str_len() and hash_*()
- *     routines
+ *     UCW Library -- Hyper-super-meta-alt-control-shift extra fast
+ *     str_len() and hash_*() routines
  *
  *     (c) 2002, Robert Spalek <robert@ucw.cz>
  *
@@ -8,8 +8,8 @@
  *     of the GNU Lesser General Public License.
  */
 
-#ifndef _SHERLOCK_HASHFUNC_H
-#define _SHERLOCK_HASHFUNC_H
+#ifndef _UCW_HASHFUNC_H
+#define _UCW_HASHFUNC_H
 
 #include "lib/lib.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