diff options
| author | Alan Rogers <alan@github.com> | 2014-07-22 15:08:24 +1000 |
|---|---|---|
| committer | Alan Rogers <alan@github.com> | 2014-07-22 15:08:24 +1000 |
| commit | 7d0ab0fae04015e0bc66ff16beae495f13969b10 (patch) | |
| tree | 09323e451046ef9dfa6f83754c3fe1fb3d327b48 /src/util.c | |
| parent | e824e63de6724557946ba155034ff8c864f594d2 (diff) | |
| parent | 091165c53b2bcd5d41fb71d43ed5a23a3d96bf5d (diff) | |
| download | libgit2-7d0ab0fae04015e0bc66ff16beae495f13969b10.tar.gz | |
Merge remote-tracking branch 'origin/master' into fix-git-status-list-new-unreadable-folder
Diffstat (limited to 'src/util.c')
| -rw-r--r-- | src/util.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/util.c b/src/util.c index f9d37e4f4..5c305950f 100644 --- a/src/util.c +++ b/src/util.c @@ -613,7 +613,8 @@ void git__qsort_r( defined(__OpenBSD__) || defined(__NetBSD__) || \ defined(__gnu_hurd__) || defined(__ANDROID_API__) || \ defined(__sun) || defined(__CYGWIN__) || \ - (__GLIBC__ == 2 && __GLIBC_MINOR__ < 8) + (__GLIBC__ == 2 && __GLIBC_MINOR__ < 8) || \ + (defined(_MSC_VER) && _MSC_VER < 1500) git__insertsort_r(els, nel, elsize, NULL, cmp, payload); #elif defined(GIT_WIN32) git__qsort_r_glue glue = { cmp, payload }; |