X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fhashtable.h;h=1c40ea9d6729f3f7b61a75838fd9015d5e5852f1;hb=0d56b467cc2184f00a4e390f95596704d819dfa3;hp=b18b01fce6acdfa1797db836db9590c500b12622;hpb=eaf1ce4329cf3d7b8c2988aaa4a4d3aba725323d;p=libucw.git

diff --git a/lib/hashtable.h b/lib/hashtable.h
index b18b01fc..1c40ea9d 100644
--- a/lib/hashtable.h
+++ b/lib/hashtable.h
@@ -263,19 +263,19 @@ static inline void P(init_data) (P(node) *n UNUSED)
 
 #ifdef HASH_GIVE_ALLOC
 /* If the caller has requested to use his own allocation functions, do so */
-static inline void * P(init_alloc) (void) { }
-static inline void * P(cleanup_alloc) (void) { }
+static inline void P(init_alloc) (void) { }
+static inline void P(cleanup_alloc) (void) { }
 
 #elif defined(HASH_USE_POOL)
 /* If the caller has requested to use his mempool, do so */
-#include "lib/pools.h"
+#include "lib/mempool.h"
 static inline void * P(alloc) (unsigned int size) { return mp_alloc_fast(HASH_USE_POOL, size); }
-static inline void * P(init_alloc) (void) { }
-static inline void * P(cleanup_alloc) (void) { }
+static inline void P(init_alloc) (void) { }
+static inline void P(cleanup_alloc) (void) { }
 
 #elif defined(HASH_AUTO_POOL)
 /* Use our own pools */
-#include "lib/pools.h"
+#include "lib/mempool.h"
 static struct mempool *P(pool);
 static inline void * P(alloc) (unsigned int size) { return mp_alloc_fast(P(pool), size); }
 static inline void P(init_alloc) (void) { P(pool) = mp_new(HASH_AUTO_POOL); }
@@ -285,8 +285,8 @@ static inline void P(cleanup_alloc) (void) { mp_delete(P(pool)); }
 /* The default allocation method */
 static inline void * P(alloc) (unsigned int size) { return xmalloc(size); }
 static inline void P(free) (void *x) { xfree(x); }
-static inline void * P(init_alloc) (void) { }
-static inline void * P(cleanup_alloc) (void) { }
+static inline void P(init_alloc) (void) { }
+static inline void P(cleanup_alloc) (void) { }
 
 #endif