summaryrefslogtreecommitdiff
path: root/lib/ccan/list/test/run-list_del_from-assert.c
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2012-03-21 00:58:14 +1030
committerRusty Russell <rusty@rustcorp.com.au>2012-03-22 01:57:37 +0100
commit675593221c25dbebaaf8e4ce9f4271a8fb0171d0 (patch)
treee1f57a9e3919adb163c0acf1072708aca912945a /lib/ccan/list/test/run-list_del_from-assert.c
parenteafd83736918bc5953e4a91cf2d893e68f2da2a2 (diff)
downloadsamba-675593221c25dbebaaf8e4ce9f4271a8fb0171d0.tar.gz
samba-675593221c25dbebaaf8e4ce9f4271a8fb0171d0.tar.bz2
samba-675593221c25dbebaaf8e4ce9f4271a8fb0171d0.zip
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 <rusty@rustcorp.com.au>
Diffstat (limited to 'lib/ccan/list/test/run-list_del_from-assert.c')
-rw-r--r--lib/ccan/list/test/run-list_del_from-assert.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/ccan/list/test/run-list_del_from-assert.c b/lib/ccan/list/test/run-list_del_from-assert.c
index 05d6cad62c..37a37603f6 100644
--- a/lib/ccan/list/test/run-list_del_from-assert.c
+++ b/lib/ccan/list/test/run-list_del_from-assert.c
@@ -9,28 +9,28 @@
int main(int argc, char *argv[])
{
- struct list_head list1, list2;
- struct list_node n1, n2, n3;
+ struct ccan_list_head list1, list2;
+ struct ccan_list_node n1, n2, n3;
pid_t child;
int status;
plan_tests(1);
- list_head_init(&list1);
- list_head_init(&list2);
- list_add(&list1, &n1);
- list_add(&list2, &n2);
- list_add_tail(&list2, &n3);
+ ccan_list_head_init(&list1);
+ ccan_list_head_init(&list2);
+ ccan_list_add(&list1, &n1);
+ ccan_list_add(&list2, &n2);
+ ccan_list_add_tail(&list2, &n3);
child = fork();
if (child) {
wait(&status);
} else {
/* This should abort. */
- list_del_from(&list1, &n3);
+ ccan_list_del_from(&list1, &n3);
exit(0);
}
ok1(WIFSIGNALED(status) && WTERMSIG(status) == SIGABRT);
- list_del_from(&list2, &n3);
+ ccan_list_del_from(&list2, &n3);
return exit_status();
}