Merge branch 'mh/split-under-lock'

diff --git a/dir.h b/dir.h
index 5f19acc272643d3de0b78ec1d4fada97b53e54f1..da1a858b3a12daba5bd348fcaa342534edaacdb6 100644 (file)
--- a/dir.h
+++ b/dir.h
@@ -293,9 +293,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 fnmatch_icase(const char *pattern, const char *string, int flags);
+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.