summaryrefslogtreecommitdiff
path: root/lib/ccan/failtest
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/failtest
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/failtest')
-rw-r--r--lib/ccan/failtest/_info1
-rw-r--r--lib/ccan/failtest/failtest.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/ccan/failtest/_info b/lib/ccan/failtest/_info
index 4a5b97c931..ac9b09aea3 100644
--- a/lib/ccan/failtest/_info
+++ b/lib/ccan/failtest/_info
@@ -68,6 +68,7 @@ int main(int argc, char *argv[])
printf("ccan/compiler\n");
printf("ccan/hash\n");
printf("ccan/htable\n");
+ printf("ccan/list\n");
printf("ccan/read_write_all\n");
printf("ccan/str\n");
printf("ccan/time\n");
diff --git a/lib/ccan/failtest/failtest.h b/lib/ccan/failtest/failtest.h
index 9af5669678..f4b6ec8355 100644
--- a/lib/ccan/failtest/failtest.h
+++ b/lib/ccan/failtest/failtest.h
@@ -155,7 +155,7 @@ struct lseek_call {
*/
struct failtest_call {
/* We're in the history list. */
- struct list_node list;
+ struct ccan_list_node list;
enum failtest_call_type type;
/* Where we were called from. */
const char *file;