Merge part of js/portable into next

diff --git a/cache.h b/cache.h
index 6542214c1e08ae1d029cec954cca37b8e762cbe1..5020f0714a89cd8420be47a06937390d00ea5450 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -248,8 +248,8 @@ void datestamp(char *buf, int bufsize);
 unsigned long approxidate(const char *);
 
 extern int setup_ident(void);
-extern const char *git_author_info(void);
-extern const char *git_committer_info(void);
+extern const char *git_author_info(int);
+extern const char *git_committer_info(int);
 
 struct checkout {
        const char *base_dir;