tree.h: Restore ability to generate static functions
authorJohn Marino <draco@marino.st>
Sat, 7 Nov 2015 23:42:43 +0000 (00:42 +0100)
committerJohn Marino <draco@marino.st>
Sat, 7 Nov 2015 23:42:43 +0000 (00:42 +0100)
These two functions were hardcodes as "static" before the previous
commit which removed the qualifier.  Instead, "static" should have
been changed to the the STORQUAL macro argument.

Doing so now fixes static RB function generation.

sys/sys/tree.h

index 695a065..cf5d66a 100644 (file)
@@ -455,7 +455,7 @@ struct type *name##_RB_LOOKUP_##ext (struct name *, datatype)               \
        _RB_GENERATE(name, type, field, cmp, __unused static)
 
 #define _RB_GENERATE(name, type, field, cmp, STORQUAL)                 \
-void                                                           \
+STORQUAL void                                                          \
 name##_RB_INSERT_COLOR(struct name *head, struct type *elm)            \
 {                                                                      \
        struct type *parent, *gparent, *tmp;                            \
@@ -499,7 +499,7 @@ name##_RB_INSERT_COLOR(struct name *head, struct type *elm)         \
        RB_COLOR(head->rbh_root, field) = RB_BLACK;                     \
 }                                                                      \
                                                                        \
-void                                                           \
+STORQUAL void                                                          \
 name##_RB_REMOVE_COLOR(struct name *head, struct type *parent,         \
                        struct type *elm)                               \
 {                                                                      \