diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/compat/fnmatch.c (renamed from src/win32/fnmatch.c) | 0 | ||||
| -rw-r--r-- | src/compat/fnmatch.h (renamed from src/win32/fnmatch.h) | 4 | ||||
| -rw-r--r-- | src/unix/posix.h | 8 | ||||
| -rw-r--r-- | src/win32/posix.h | 2 |
4 files changed, 9 insertions, 5 deletions
diff --git a/src/win32/fnmatch.c b/src/compat/fnmatch.c index 835d811bc..835d811bc 100644 --- a/src/win32/fnmatch.c +++ b/src/compat/fnmatch.c diff --git a/src/win32/fnmatch.h b/src/compat/fnmatch.h index eb7c5f6f7..7faef09b3 100644 --- a/src/win32/fnmatch.h +++ b/src/compat/fnmatch.h @@ -4,8 +4,8 @@ * This file is part of libgit2, distributed under the GNU GPL v2 with * a Linking Exception. For full terms see the included COPYING file. */ -#ifndef INCLUDE_fnmatch__w32_h__ -#define INCLUDE_fnmatch__w32_h__ +#ifndef INCLUDE_fnmatch__compat_h__ +#define INCLUDE_fnmatch__compat_h__ #include "common.h" diff --git a/src/unix/posix.h b/src/unix/posix.h index 9973acf30..6d0d0dfa6 100644 --- a/src/unix/posix.h +++ b/src/unix/posix.h @@ -7,7 +7,12 @@ #ifndef INCLUDE_posix__w32_h__ #define INCLUDE_posix__w32_h__ -#include <fnmatch.h> +#ifndef __sun +# include <fnmatch.h> +# define p_fnmatch(p, s, f) fnmatch(p, s, f) +#else +# include "compat/fnmatch.h" +#endif #define p_lstat(p,b) lstat(p,b) #define p_readlink(a, b, c) readlink(a, b, c) @@ -16,7 +21,6 @@ #define p_mkdir(p,m) mkdir(p, m) #define p_fsync(fd) fsync(fd) #define p_realpath(p, po) realpath(p, po) -#define p_fnmatch(p, s, f) fnmatch(p, s, f) #define p_vsnprintf(b, c, f, a) vsnprintf(b, c, f, a) #define p_snprintf(b, c, f, ...) snprintf(b, c, f, __VA_ARGS__) #define p_mkstemp(p) mkstemp(p) diff --git a/src/win32/posix.h b/src/win32/posix.h index 2666fccb4..baa4a3b4e 100644 --- a/src/win32/posix.h +++ b/src/win32/posix.h @@ -8,7 +8,7 @@ #define INCLUDE_posix__w32_h__ #include "common.h" -#include "fnmatch.h" +#include "compat/fnmatch.h" #include "utf-conv.h" GIT_INLINE(int) p_link(const char *old, const char *new) |