From 675593221c25dbebaaf8e4ce9f4271a8fb0171d0 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Wed, 21 Mar 2012 00:58:14 +1030 Subject: lib/ccan: namespacize ccan/list to avoid conflict with OpenIndiana's sys/list.h CCAN includes a little utility called "namespacize" which prepends ccan_ to all public methods of a module, and fixes up any dependencies it finds. It's a little primitive, but it works here. Signed-off-by: Rusty Russell --- lib/ccan/list/test/compile_ok-constant.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'lib/ccan/list/test/compile_ok-constant.c') diff --git a/lib/ccan/list/test/compile_ok-constant.c b/lib/ccan/list/test/compile_ok-constant.c index c57cdadc31..acd8601a6b 100644 --- a/lib/ccan/list/test/compile_ok-constant.c +++ b/lib/ccan/list/test/compile_ok-constant.c @@ -6,39 +6,39 @@ struct child { const char *name; - struct list_node list; + struct ccan_list_node list; }; -static bool children(const struct list_head *list) +static bool children(const struct ccan_list_head *list) { - return !list_empty(list); + return !ccan_list_empty(list); } -static const struct child *first_child(const struct list_head *list) +static const struct child *first_child(const struct ccan_list_head *list) { - return list_top(list, struct child, list); + return ccan_list_top(list, struct child, list); } -static const struct child *last_child(const struct list_head *list) +static const struct child *last_child(const struct ccan_list_head *list) { - return list_tail(list, struct child, list); + return ccan_list_tail(list, struct child, list); } -static void check_children(const struct list_head *list) +static void check_children(const struct ccan_list_head *list) { - list_check(list, "bad child list"); + ccan_list_check(list, "bad child list"); } -static void print_children(const struct list_head *list) +static void print_children(const struct ccan_list_head *list) { const struct child *c; - list_for_each(list, c, list) + ccan_list_for_each(list, c, list) printf("%s\n", c->name); } int main(void) { - LIST_HEAD(h); + CCAN_LIST_HEAD(h); children(&h); first_child(&h); -- cgit