tdb: use tdb_nest_lock() for active lock.

[ccan] / tools / tools.h

diff --git a/tools/tools.h b/tools/tools.h
index ed2f6bfb6e77442e9682f450d34db6b2cce6e93e..34c2f99ff1253fe38a888fe697c79f9bb07fb323 100644 (file)
--- a/tools/tools.h
+++ b/tools/tools.h
@@ -8,21 +8,20 @@
 
 #define SPACE_CHARS    " \f\n\r\t\v"
 
-/* FIXME: Remove some -I */
 /* FIXME: Nested functions break with -Wmissing-prototypes -Wmissing-declarations */
-#define CFLAGS "-g -Wall -Wundef -Wstrict-prototypes -Wold-style-definition -Werror -Iccan/ -I. -I.. -I../.."
+#define CFLAGS "-g -Wall -Wundef -Wstrict-prototypes -Wold-style-definition -Werror -I../.."
 
 /* This actually compiles and runs the info file to get dependencies. */
-char **get_deps(const void *ctx, const char *dir, const char *name,
-               bool recurse, char **infofile);
+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, const char *name,
+char **get_safe_ccan_deps(const void *ctx, const char *dir,
                          bool recurse, char **infofile);
 
 /* This also needs to compile the info file. */
 char **get_libs(const void *ctx, const char *dir,
-               const char *name, unsigned int *num, char **infofile);
+               unsigned int *num, char **infofile);
 
 /* From tools.c */
 char *talloc_basename(const void *ctx, const char *dir);
@@ -30,6 +29,7 @@ char *talloc_dirname(const void *ctx, const char *dir);
 char *talloc_getcwd(const void *ctx);
 char *run_command(const void *ctx, const char *fmt, ...);
 char *temp_file(const void *ctx, const char *extension);
+bool move_file(const char *oldname, const char *newname);
 
 /* From compile.c.
  *
@@ -39,9 +39,10 @@ char *temp_file(const void *ctx, const char *extension);
 /* Compile multiple object files into a single. */
 char *link_objects(const void *ctx, const char *objs, char **errmsg);
 /* Compile a single C file to an object file.  Returns errmsg if fails. */
-char *compile_object(const void *ctx, const char *cfile, char **errmsg);
+char *compile_object(const void *ctx, const char *cfile, const char *ccandir,
+                    char **errmsg);
 /* Compile and link single C file, with object files, libs, etc. */
-char *compile_and_link(const void *ctx, const char *cfile, const char *objs,
-                      const char *extra_cflags, const char *libs,
-                      char **errmsg);
+char *compile_and_link(const void *ctx, const char *cfile, const char *ccandir,
+                      const char *objs, const char *extra_cflags,
+                      const char *libs, char **errmsg);
 #endif /* CCAN_TOOLS_H */