Merge branch 'maint'

diff --git a/cache.h b/cache.h
index f172d02a653475fcf715eb5605012abf50c5621b..faed2a8994ee6b8262c7929bfabf80e0a3e6a974 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -480,6 +480,7 @@ extern struct tag *alloc_tag_node(void);
 extern void alloc_report(void);
 
 /* trace.c */
+extern int nfasprintf(char **str, const char *fmt, ...);
 extern int nfvasprintf(char **str, const char *fmt, va_list va);
 extern void trace_printf(const char *format, ...);
 extern void trace_argv_printf(const char **argv, int count, const char *format, ...);