From: Rusty Russell <rusty@rustcorp.com.au>
Date: Sat, 9 Jun 2012 06:11:23 +0000 (+0930)
Subject: ccan: make failtest use ccan/err.
X-Git-Tag: samba-4.0.0beta2~268
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=aeb3ff5c8667328f7f837412e9ec4365e3853cce;p=ddiss%2Fsamba.git

ccan: make failtest use ccan/err.

As per CCAN commit 48b700953f9c856102e91596103238f5da9ea079.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---

diff --git a/lib/ccan/failtest/_info b/lib/ccan/failtest/_info
index ac9b09aea38..da65bcb985f 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 a4a374f4fb4..ce92758f8da 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>