summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRussell Belfer <rb@github.com>2012-10-11 11:58:00 -0700
committerRussell Belfer <rb@github.com>2012-10-15 12:54:46 -0700
commit824d5e4d260fc740dbe9251008439b9e58db5f19 (patch)
tree03d0c83fbf7f9921c1a41b08c7c3f7c2a426bd17 /src
parent1c3acf148b97c952fcb942a73cda9f891f04f1b5 (diff)
downloadlibgit2-824d5e4d260fc740dbe9251008439b9e58db5f19.tar.gz
Always use internal fnmatch, not system
Diffstat (limited to 'src')
-rw-r--r--src/fnmatch.c (renamed from src/compat/fnmatch.c)0
-rw-r--r--src/fnmatch.h (renamed from src/compat/fnmatch.h)0
-rw-r--r--src/posix.h1
-rw-r--r--src/unix/posix.h7
-rw-r--r--src/win32/posix.h1
5 files changed, 1 insertions, 8 deletions
diff --git a/src/compat/fnmatch.c b/src/fnmatch.c
index 835d811bc..835d811bc 100644
--- a/src/compat/fnmatch.c
+++ b/src/fnmatch.c
diff --git a/src/compat/fnmatch.h b/src/fnmatch.h
index 7faef09b3..7faef09b3 100644
--- a/src/compat/fnmatch.h
+++ b/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 <fcntl.h>
#include <time.h>
+#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 <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)
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)