From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 3 Apr 2014 19:38:38 +0000 (-0700)
Subject: Merge branch 'cb/aix'
X-Git-Tag: v2.0.0-rc0~27
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8ba87adad637b402fb309754e213ec40b74e4f18

Merge branch 'cb/aix'

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

8ba87adad637b402fb309754e213ec40b74e4f18
diff --cc dir.c
index 99f53033ba,a1740a51c9..eb6f581270
--- a/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))