From: Martin Mares <mj@ucw.cz>
Date: Sat, 10 Jan 2004 13:44:38 +0000 (+0000)
Subject: Use GLUE_ instead of HASH_GLUE.
X-Git-Tag: holmes-import~1142
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=eaf1ce4329cf3d7b8c2988aaa4a4d3aba725323d;p=libucw.git

Use GLUE_ instead of HASH_GLUE.
---

diff --git a/lib/hashtable.h b/lib/hashtable.h
index 49d45ba7..b18b01fc 100644
--- a/lib/hashtable.h
+++ b/lib/hashtable.h
@@ -527,15 +527,14 @@ static void P(remove) (P(node) *n)
 #define HASH_FOR_ALL(h_px, h_var)							\
 do {											\
   uns h_slot;										\
-  struct HASH_GLUE(h_px,bucket) *h_buck;						\
-  for (h_slot=0; h_slot < HASH_GLUE(h_px,table).hash_size; h_slot++)			\
-    for (h_buck = HASH_GLUE(h_px,table).ht[h_slot]; h_buck; h_buck = h_buck->next)	\
+  struct GLUE_(h_px,bucket) *h_buck;							\
+  for (h_slot=0; h_slot < GLUE_(h_px,table).hash_size; h_slot++)			\
+    for (h_buck = GLUE_(h_px,table).ht[h_slot]; h_buck; h_buck = h_buck->next)	\
       {											\
-	HASH_GLUE(h_px,node) *h_var = &h_buck->n;
+	GLUE_(h_px,node) *h_var = &h_buck->n;
 #define HASH_END_FOR } } while(0)
 #define HASH_BREAK 
 #define HASH_CONTINUE continue
-#define HASH_GLUE(x,y) x##_##y
 
 #endif