From 824d5e4d260fc740dbe9251008439b9e58db5f19 Mon Sep 17 00:00:00 2001 From: Russell Belfer Date: Thu, 11 Oct 2012 11:58:00 -0700 Subject: [PATCH] Always use internal fnmatch, not system --- src/{compat => }/fnmatch.c | 0 src/{compat => }/fnmatch.h | 0 src/posix.h | 1 + src/unix/posix.h | 7 ------- src/win32/posix.h | 1 - 5 files changed, 1 insertion(+), 8 deletions(-) rename src/{compat => }/fnmatch.c (100%) rename src/{compat => }/fnmatch.h (100%) diff --git a/src/compat/fnmatch.c b/src/fnmatch.c similarity index 100% rename from src/compat/fnmatch.c rename to src/fnmatch.c diff --git a/src/compat/fnmatch.h b/src/fnmatch.h similarity index 100% rename from src/compat/fnmatch.h rename to src/fnmatch.h diff --git a/src/posix.h b/src/posix.h index 71bb82283..d565dc11f 100644 --- a/src/posix.h +++ b/src/posix.h @@ -10,6 +10,7 @@ #include "common.h" #include #include +#include "fnmatch.h" #ifndef S_IFGITLINK #define S_IFGITLINK 0160000 diff --git a/src/unix/posix.h b/src/unix/posix.h index 25038c827..bcd800301 100644 --- a/src/unix/posix.h +++ b/src/unix/posix.h @@ -7,13 +7,6 @@ #ifndef INCLUDE_posix__w32_h__ #define INCLUDE_posix__w32_h__ -#if !defined(__sun) && !defined(__amigaos4__) -# include -# define p_fnmatch(p, s, f) fnmatch(p, s, f) -#else -# include "compat/fnmatch.h" -#endif - #include #define p_lstat(p,b) lstat(p,b) diff --git a/src/win32/posix.h b/src/win32/posix.h index da46cf514..80dcca5c1 100644 --- a/src/win32/posix.h +++ b/src/win32/posix.h @@ -8,7 +8,6 @@ #define INCLUDE_posix__w32_h__ #include "common.h" -#include "compat/fnmatch.h" #include "utf-conv.h" GIT_INLINE(int) p_link(const char *old, const char *new)