Added the local copy of the regex library back.

[libucw.git] / lib / hashtable.h

diff --git a/lib/hashtable.h b/lib/hashtable.h
index ec581ed777bb9743826b963204bb6e940965837f..552e88eaa2b183a7bee566c55478a5f4706b407e 100644 (file)
--- a/lib/hashtable.h
+++ b/lib/hashtable.h
@@ -349,8 +349,8 @@ static inline void P(cleanup_alloc) (TAU) { }
 #endif
 
 #ifdef HASH_TABLE_ALLOC
-static inline void * P(table_alloc) (TAUC unsigned int size) { return P(alloc)(size); }
-static inline void P(table_free) (TAUC void *x) { P(free)(x); }
+static inline void * P(table_alloc) (TAUC unsigned int size) { return P(alloc)(TTC size); }
+static inline void P(table_free) (TAUC void *x) { P(free)(TTC x); }
 #else
 static inline void * P(table_alloc) (TAUC unsigned int size) { return xmalloc(size); }
 static inline void P(table_free) (TAUC void *x) { xfree(x); }
@@ -401,8 +401,8 @@ static void P(init) (TA)
 #else
   T.hash_hard_max = 1 << 28;
 #endif
-  P(alloc_table)(TT);
   P(init_alloc)(TT);
+  P(alloc_table)(TT);
 }
 
 #ifdef HASH_WANT_CLEANUP
@@ -644,6 +644,8 @@ do {                                                                                        \
 #undef HASH_KEY_DECL
 #undef HASH_KEY_ENDSTRING
 #undef HASH_KEY_STRING
+#undef HASH_KEY_MEMORY
+#undef HASH_KEY_SIZE
 #undef HASH_NOCASE
 #undef HASH_NODE
 #undef HASH_PREFIX