Adapted to new unicode includes.

[libucw.git] / lib / redblack.h

diff --git a/lib/redblack.h b/lib/redblack.h
index aacd744d4c97510adfddf1e349365683277ed532..2af759f1a65431b90832119cb7f9745d2551e15d 100644 (file)
--- a/lib/redblack.h
+++ b/lib/redblack.h
@@ -940,13 +940,12 @@ static P(node) * P(first_node) (T *t, uns direction)
 #define TREE_FOR_ALL(t_px, t_ptr, t_var)                                               \
 do                                                                                     \
 {                                                                                      \
 #define TREE_FOR_ALL(t_px, t_ptr, t_var)                                               \
 do                                                                                     \
 {                                                                                      \

-       TREE_GLUE(t_px,node) *t_var = TREE_GLUE(t_px,first_node)(t_ptr, 0);             \
-       for (; t_var; t_var = TREE_GLUE(t_px,adjacent)(t_var, 1))                       \
+       GLUE_(t_px,node) *t_var = GLUE_(t_px,first_node)(t_ptr, 0);                     \
+       for (; t_var; t_var = GLUE_(t_px,adjacent)(t_var, 1))                           \

        {
 #define TREE_END_FOR } } while(0)
 #define TREE_BREAK break
 #define TREE_CONTINUE continue
        {
 #define TREE_END_FOR } } while(0)
 #define TREE_BREAK break
 #define TREE_CONTINUE continue

-#define TREE_GLUE(x,y) x##_##y

 
 #endif
 #endif
 
 #endif
 #endif