antithread, failtest: use ccan/err instead of err.h.

diff --git a/ccan/antithread/_info b/ccan/antithread/_info
index 9caff0e4a0a48b607be026ae3ccb71e605304f02..ca8cd16c597b785733cac127d8316ab07d663f24 100644 (file)
--- 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 cd383599a1cf948f0abeb1d7bfde624ff0572046..080f890cd859fc6390c19e4e1daa18025283fb30 100644 (file)
--- 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 020a8bc68f51e5bd823ab25636aa452361cf6d30..ca2b60ea37c40931a5262945470b4764ffa465ef 100644 (file)
--- 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 dae3024ef97f55c24be4169a6589e7ef01258373..b3ee0337ebd96cfb7fe9a3b7cd3114fe473404c8 100644 (file)
--- 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>