Update to git v2.14: commit b2141fc (config: don't include
config.h by default) made it necessary to that config.h be explicitly
included when needed.

Signed-off-by: Jeff Smith <whydo...@gmail.com>
---
 scan-tree.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scan-tree.c b/scan-tree.c
index 08f3f1d..c8d175e 100644
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -10,6 +10,7 @@
 #include "scan-tree.h"
 #include "configfile.h"
 #include "html.h"
+#include "config.h"
 
 /* return 1 if path contains a objects/ directory and a HEAD file */
 static int is_git_dir(const char *path)
@@ -48,7 +49,7 @@ out:
 static struct cgit_repo *repo;
 static repo_config_fn config_fn;
 
-static void repo_config(const char *name, const char *value)
+static void scan_tree_repo_config(const char *name, const char *value)
 {
        config_fn(repo, name, value);
 }
@@ -178,7 +179,7 @@ static void add_repo(const char *base, struct strbuf *path, 
repo_config_fn fn)
 
        strbuf_addstr(path, "cgitrc");
        if (!stat(path->buf, &st))
-               parse_configfile(path->buf, &repo_config);
+               parse_configfile(path->buf, &scan_tree_repo_config);
 
        strbuf_release(&rel);
 }
-- 
2.9.4

_______________________________________________
CGit mailing list
CGit@lists.zx2c4.com
https://lists.zx2c4.com/mailman/listinfo/cgit

Reply via email to