Merge branch 'cb/aix'

* cb/aix:
tests: don't rely on strerror text when testing rmdir failure
dir.c: make git_fnmatch() not inline

diff --cc dir.c
index 99f53033ba174301437c65b1dfa8f8cceb74f517,a1740a51c957ae2e86412b9e20c59a51880df53d..eb6f581270f81a2e844e3396f966e67d06d27f41
--- 1/dir.c
--- 2/dir.c
+++ b/dir.c
@@@ -49,14 -49,12 +49,14 @@@ int strncmp_icase(const char *a, const 
  
  int fnmatch_icase(const char *pattern, const char *string, int flags)
  {
 -      return fnmatch(pattern, string, flags | (ignore_case ? FNM_CASEFOLD : 0));
 +      return wildmatch(pattern, string,
 +                       flags | (ignore_case ? WM_CASEFOLD : 0),
 +                       NULL);
  }
  
- inline int git_fnmatch(const struct pathspec_item *item,
-                      const char *pattern, const char *string,
-                      int prefix)
+ int git_fnmatch(const struct pathspec_item *item,
+               const char *pattern, const char *string,
+               int prefix)
  {
        if (prefix > 0) {
                if (ps_strncmp(item, pattern, string, prefix))

diff --cc t/t7001-mv.sh
Simple merge