Merge branch 'maint-2.8' into maint-2.9

diff --git a/dir.h b/dir.h
index d56d2fb48f68191d54fdfb8c5c104cb87cba1c41..bfde698c488adcc75b7a294476c622afb6f92b36 100644 (file)
--- a/dir.h
+++ b/dir.h
@@ -270,8 +270,8 @@ extern int remove_dir_recursively(struct strbuf *path, int flag);
 /* tries to remove the path with empty directories along it, ignores ENOENT */
 extern int remove_path(const char *path);
 
-extern int strcmp_icase(const char *a, const char *b);
-extern int strncmp_icase(const char *a, const char *b, size_t count);
+extern int fspathcmp(const char *a, const char *b);
+extern int fspathncmp(const char *a, const char *b, size_t count);
 
 /*
  * The prefix part of pattern must not contains wildcards.