diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-03-14 14:25:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-14 14:25:31 -0700 |
| commit | 650c90a18506ce05e2be349d83fe1cef3dc7f8cb (patch) | |
| tree | 6852107d8a2a0d30ea2cfac400fc33bce72fe7bc /git-compat-util.h | |
| parent | 3a66e1bf9c45ac16169c3b6d4a096d5af3ba6929 (diff) | |
| parent | 2c0a1bd616f6d81905c4e8b98e8c9f2d7324924c (diff) | |
| download | git-650c90a18506ce05e2be349d83fe1cef3dc7f8cb.tar.gz | |
Merge branch 'nd/no-more-fnmatch'
We started using wildmatch() in place of fnmatch(3); complete the
process and stop using fnmatch(3).
* nd/no-more-fnmatch:
actually remove compat fnmatch source code
stop using fnmatch (either native or compat)
Revert "test-wildmatch: add "perf" command to compare wildmatch and fnmatch"
use wildmatch() directly without fnmatch() wrapper
Diffstat (limited to 'git-compat-util.h')
| -rw-r--r-- | git-compat-util.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/git-compat-util.h b/git-compat-util.h index 082eb0d1b7..585ef8a79b 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -116,9 +116,6 @@ #include <sys/time.h> #include <time.h> #include <signal.h> -#ifndef USE_WILDMATCH -#include <fnmatch.h> -#endif #include <assert.h> #include <regex.h> #include <utime.h> @@ -304,16 +301,7 @@ extern char *gitbasename(char *); #include "compat/bswap.h" -#ifdef USE_WILDMATCH #include "wildmatch.h" -#define FNM_PATHNAME WM_PATHNAME -#define FNM_CASEFOLD WM_CASEFOLD -#define FNM_NOMATCH WM_NOMATCH -static inline int fnmatch(const char *pattern, const char *string, int flags) -{ - return wildmatch(pattern, string, flags, NULL); -} -#endif /* General helper functions */ extern void vreportf(const char *prefix, const char *err, va_list params); |