diff options
| author | Vicent Marti <tanoku@gmail.com> | 2012-05-19 03:46:11 +0400 |
|---|---|---|
| committer | Vicent Marti <tanoku@gmail.com> | 2012-05-19 03:46:11 +0400 |
| commit | 5b9fac39d8a76b9139667c26a63e6b3f204b3977 (patch) | |
| tree | e6ba28025f92c16563c4ffa8bc60b95f17d69691 /src/unix/posix.h | |
| parent | 7ef9f1b5606c2672105ecbbf34c022a71ef212fe (diff) | |
| parent | ad5df35a47d56c3d716d7a56eac4aeb611987c11 (diff) | |
Merge branch 'development'v0.17.0
Conflicts:
.travis.yml
Diffstat (limited to 'src/unix/posix.h')
| -rw-r--r-- | src/unix/posix.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/unix/posix.h b/src/unix/posix.h index 881e651f4..48b492941 100644 --- a/src/unix/posix.h +++ b/src/unix/posix.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2011 the libgit2 contributors + * Copyright (C) 2009-2012 the libgit2 contributors * * This file is part of libgit2, distributed under the GNU GPL v2 with * a Linking Exception. For full terms see the included COPYING file. @@ -7,7 +7,14 @@ #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 + +#include <stdio.h> #define p_lstat(p,b) lstat(p,b) #define p_readlink(a, b, c) readlink(a, b, c) @@ -16,7 +23,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) |