X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Ftools.h;h=f3e132d97a37110c92da61ba48d3f82e7c46f3e8;hp=a4c4cfa06b8f3bd79ff3b5e7ed274143b8634c51;hb=a99c2ccf97465d47c3277d997ea93f20ff97ad4d;hpb=1f45ec04761cd99011445c6d41cd64a3951f77e0

diff --git a/tools/tools.h b/tools/tools.h
index a4c4cfa0..f3e132d9 100644
--- a/tools/tools.h
+++ b/tools/tools.h
@@ -24,8 +24,7 @@ char **get_deps(const void *ctx, const char *dir, bool recurse,
 		char **infofile);
 
 /* This is safer: just looks for ccan/ strings in info */
-char **get_safe_ccan_deps(const void *ctx, const char *dir,
-			  bool recurse, char **infofile);
+char **get_safe_ccan_deps(const void *ctx, const char *dir, bool recurse);
 
 /* This also needs to compile the info file. */
 char **get_libs(const void *ctx, const char *dir,
@@ -43,7 +42,7 @@ bool PRINTF_FMT(4,5) run_command(const void *ctx,
 				 const char *fmt, ...);
 char *run_with_timeout(const void *ctx, const char *cmd,
 		       bool *ok, unsigned *timeout_ms);
-char *temp_dir(const void *ctx);
+const char *temp_dir(const void *ctx);
 bool move_file(const char *oldname, const char *newname);
 
 /* From compile.c.
@@ -58,11 +57,13 @@ char *link_objects(const void *ctx, const char *basename, bool in_pwd,
 		   const char *objs, char **errmsg);
 /* Compile a single C file to an object file.  Returns false if fails. */
 bool compile_object(const void *ctx, const char *cfile, const char *ccandir,
-		    const char *extra_cflags,
+		    const char *compiler,
+		    const char *cflags,
 		    const char *outfile, char **output);
 /* Compile and link single C file, with object files, libs, etc. */
 bool compile_and_link(const void *ctx, const char *cfile, const char *ccandir,
-		      const char *objs, const char *extra_cflags,
+		      const char *objs,
+		      const char *compiler, const char *cflags,
 		      const char *libs, const char *outfile, char **output);
 
 /* If in_pwd is false, return a file int temp_dir, otherwise a local file. */