X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fhashtable.h;h=552e88eaa2b183a7bee566c55478a5f4706b407e;hb=e371dcc1cd2857036374dd9597705faed0427006;hp=0419a47ce6468162833f9de277b29792dca2c0a3;hpb=50f5bc89e3c03a0fdf56bf6ab860e437a7731b03;p=libucw.git

diff --git a/lib/hashtable.h b/lib/hashtable.h
index 0419a47c..552e88ea 100644
--- 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
@@ -611,7 +611,7 @@ do {											\
 	GLUE_(h_px,node) *h_var = &h_buck->n;
 #define HASH_FOR_ALL(h_px, h_var) HASH_FOR_ALL_DYNAMIC(h_px, &GLUE_(h_px,table), h_var)
 #define HASH_END_FOR } } while(0)
-#define HASH_BREAK 
+#define HASH_BREAK
 #define HASH_CONTINUE continue
 
 #endif
@@ -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