ntdb: assume HAVE_CCAN in header.

[ccan] / tools / tools.h

diff --git a/tools/tools.h b/tools/tools.h
index 1637ff51227a698420d7181c17542510ae966583..b4751bec51734230c5b49de868e31764dc8188d5 100644 (file)
--- a/tools/tools.h
+++ b/tools/tools.h
@@ -3,15 +3,14 @@
 #include "config.h"
 #include <ccan/compiler/compiler.h>
 #include <ccan/rbuf/rbuf.h>
+#include <ccan/tal/tal.h>
+#include <ccan/tal/str/str.h>
 #include <stdlib.h>
 #include <stdbool.h>
 
-#ifndef CCAN_COMPILER
-#define CCAN_COMPILER "cc"
-#endif
-#ifndef CCAN_CFLAGS
-#define CCAN_CFLAGS "-g -Wall -Wundef -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wold-style-definition -Werror"
-#endif
+/* These are the defaults. */
+#define DEFAULT_CCAN_COMPILER "cc"
+#define DEFAULT_CCAN_CFLAGS "-g"
 
 #define IDENT_CHARS    "ABCDEFGHIJKLMNOPQRSTUVWXYZ" \
                        "abcdefghijklmnopqrstuvwxyz" \
@@ -21,6 +20,9 @@
 
 #define COVERAGE_CFLAGS "-fprofile-arcs -ftest-coverage"
 
+/* Actual compiler and cflags (defaults to CCAN_COMPILER and CCAN_CFLAGS). */
+extern const char *compiler, *cflags;
+
 /* This compiles up the _info file into a temporary. */
 char *compile_info(const void *ctx, const char *dir);
 
@@ -44,20 +46,20 @@ char **get_libs(const void *ctx, const char *dir, const char *style,
 /* From tools.c */
 /* If set, print all commands run, all output they give and exit status. */
 extern bool tools_verbose;
-char *talloc_basename(const void *ctx, const char *dir);
-char *talloc_dirname(const void *ctx, const char *dir);
-char *talloc_getcwd(const void *ctx);
 bool PRINTF_FMT(4,5) run_command(const void *ctx,
                                 unsigned int *time_ms,
                                 char **output,
                                 const char *fmt, ...);
 char *run_with_timeout(const void *ctx, const char *cmd,
                       bool *ok, unsigned *timeout_ms);
-const char *temp_dir(const void *ctx);
+const char *temp_dir(void);
+void keep_temp_dir(void);
 bool move_file(const char *oldname, const char *newname);
 
-void *do_talloc_realloc(void *p, size_t size);
-void *talloc_grab_file(const void *ctx, const char *filename, size_t *size);
+void *do_tal_realloc(void *p, size_t size);
+
+/* Freed on exit: a good parent for auto cleanup. */
+tal_t *autofree(void);
 
 /* From compile.c.
  *
@@ -86,9 +88,6 @@ char *temp_file(const void *ctx, const char *extension, const char *srcname);
 /* Default wait for run_command.  Should never time out. */
 extern const unsigned int default_timeout_ms;
 
-/* Talloc destructor which unlinks file. */
-int unlink_file_destructor(char *filename);
-
 /* Get ccan/ top dir, given a directory within it. */
 const char *find_ccan_dir(const char *base);
 #endif /* CCAN_TOOLS_H */