summaryrefslogtreecommitdiff
path: root/src/unix
diff options
context:
space:
mode:
authorScott J. Goldman <scottjgo@gmail.com>2012-05-09 22:30:57 -0700
committerScott J. Goldman <scottjgo@gmail.com>2012-05-10 09:52:49 -0700
commitec42eafd4adea021d86c6fa2cbde92b87177bf3d (patch)
tree15350fc0a404028bc7946cbb8a06cde391a792e0 /src/unix
parenta9d9965b35710f865d77a13da1cf084d0c870b55 (diff)
downloadlibgit2-ec42eafd4adea021d86c6fa2cbde92b87177bf3d.tar.gz
Hook up Windows compat fnmatch() for Solaris
Since Solaris does not support some of the same flags as glibc fnmatch(), we just use the implementation we have for Windows. Now that it's no longer a windows-specific thing, I moved it into compat/ instead of win32/
Diffstat (limited to 'src/unix')
-rw-r--r--src/unix/posix.h8
1 files changed, 6 insertions, 2 deletions
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)