ntdb: assume HAVE_CCAN in header.

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

diff --git a/ccan/ntdb/ntdb.h b/ccan/ntdb/ntdb.h
index a3a627f28d8f9dee48c8798cceb115a02f6bbbe6..a0c229c1e546b7f34c40b78789e4b01710ec181e 100644 (file)
--- a/ccan/ntdb/ntdb.h
+++ b/ccan/ntdb/ntdb.h
@@ -33,6 +33,7 @@ extern "C" {
 #include <replace.h>
 #include <system/filesys.h>
 #else
+#include "config.h"
 #if HAVE_FILE_OFFSET_BITS
 #define _FILE_OFFSET_BITS 64
 #endif
@@ -59,24 +60,9 @@ extern "C" {
 #include <string.h>
 #endif
 
-#if HAVE_CCAN
 #include <ccan/compiler/compiler.h>
 #include <ccan/typesafe_cb/typesafe_cb.h>
 #include <ccan/cast/cast.h>
-#else
-#ifndef typesafe_cb_preargs
-/* Failing to have CCAN just mean less typesafe protection, etc. */
-#define typesafe_cb_preargs(rtype, atype, fn, arg, ...)        \
-       ((rtype (*)(__VA_ARGS__, atype))(fn))
-#endif
-#ifndef cast_const
-#if defined(__intptr_t_defined) || defined(HAVE_INTPTR_T)
-#define cast_const(type, expr) ((type)((intptr_t)(expr)))
-#else
-#define cast_const(type, expr) ((type *)(expr))
-#endif
-#endif
-#endif /* !HAVE_CCAN */
 
 union ntdb_attribute;
 struct ntdb_context;