summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2012-06-09 15:41:23 +0930
committerRusty Russell <rusty@rustcorp.com.au>2012-06-09 15:41:23 +0930
commitaeb3ff5c8667328f7f837412e9ec4365e3853cce (patch)
tree19400e3170a1813cec42943bf6ad7b7a5b1348db
parentd9ce876ea97d59d66c8d2892b43b7cc8392470a0 (diff)
downloadsamba-aeb3ff5c8667328f7f837412e9ec4365e3853cce.tar.gz
samba-aeb3ff5c8667328f7f837412e9ec4365e3853cce.tar.bz2
samba-aeb3ff5c8667328f7f837412e9ec4365e3853cce.zip
ccan: make failtest use ccan/err.
As per CCAN commit 48b700953f9c856102e91596103238f5da9ea079. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
-rw-r--r--lib/ccan/failtest/_info1
-rw-r--r--lib/ccan/failtest/failtest.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/ccan/failtest/_info b/lib/ccan/failtest/_info
index ac9b09aea3..da65bcb985 100644
--- a/lib/ccan/failtest/_info
+++ b/lib/ccan/failtest/_info
@@ -66,6 +66,7 @@ int main(int argc, char *argv[])
if (strcmp(argv[1], "depends") == 0) {
printf("ccan/build_assert\n");
printf("ccan/compiler\n");
+ printf("ccan/err\n");
printf("ccan/hash\n");
printf("ccan/htable\n");
printf("ccan/list\n");
diff --git a/lib/ccan/failtest/failtest.c b/lib/ccan/failtest/failtest.c
index a4a374f4fb..ce92758f8d 100644
--- a/lib/ccan/failtest/failtest.c
+++ b/lib/ccan/failtest/failtest.c
@@ -5,7 +5,6 @@
#include <stdio.h>
#include <stdarg.h>
#include <ctype.h>
-#include <err.h>
#include <unistd.h>
#include <poll.h>
#include <errno.h>
@@ -17,6 +16,7 @@
#include <sys/resource.h>
#include <signal.h>
#include <assert.h>
+#include <ccan/err/err.h>
#include <ccan/time/time.h>
#include <ccan/read_write_all/read_write_all.h>
#include <ccan/failtest/failtest_proto.h>