From 48b700953f9c856102e91596103238f5da9ea079 Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Sat, 9 Jun 2012 15:36:45 +0930
Subject: [PATCH] antithread, failtest: use ccan/err instead of err.h.

---
 ccan/antithread/_info        | 1 +
 ccan/antithread/antithread.c | 2 +-
 ccan/failtest/_info          | 1 +
 ccan/failtest/failtest.c     | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ccan/antithread/_info b/ccan/antithread/_info
index 9caff0e4..ca8cd16c 100644
--- a/ccan/antithread/_info
+++ b/ccan/antithread/_info
@@ -91,6 +91,7 @@ int main(int argc, char *argv[])
 
 	if (strcmp(argv[1], "depends") == 0) {
 		printf("ccan/alloc\n");
+		printf("ccan/err\n");
 		printf("ccan/list\n");
 		printf("ccan/noerr\n");
 		printf("ccan/read_write_all\n"); /* For tests */
diff --git a/ccan/antithread/antithread.c b/ccan/antithread/antithread.c
index cd383599..080f890c 100644
--- a/ccan/antithread/antithread.c
+++ b/ccan/antithread/antithread.c
@@ -10,8 +10,8 @@
 #include <signal.h>
 #include <errno.h>
 #include <assert.h>
-#include <err.h>
 #include "antithread.h"
+#include <ccan/err/err.h>
 #include <ccan/noerr/noerr.h>
 #include <ccan/talloc/talloc.h>
 #include <ccan/read_write_all/read_write_all.h>
diff --git a/ccan/failtest/_info b/ccan/failtest/_info
index 020a8bc6..ca2b60ea 100644
--- a/ccan/failtest/_info
+++ b/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/read_write_all\n");
diff --git a/ccan/failtest/failtest.c b/ccan/failtest/failtest.c
index dae3024e..b3ee0337 100644
--- a/ccan/failtest/failtest.c
+++ b/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>
-- 
2.39.2