summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorVicent Martí <vicent@github.com>2013-04-15 11:19:12 -0700
committerVicent Martí <vicent@github.com>2013-04-15 11:19:12 -0700
commit77849ebf1e39126bcb9f1245423749d45d226022 (patch)
treeed37a8e41fb70da62488a0e94ccb492b1bc7a2d3 /src
parent2d2260da41ddf22fd5c5f0c39ce16fad1548f29e (diff)
parent4a3f69b5b23efd123b3730ee999443b38cb11419 (diff)
downloadlibgit2-77849ebf1e39126bcb9f1245423749d45d226022.tar.gz
Merge pull request #1468 from carlosmn/obsd-sparc64
OpenBSD & sparc64 fixes
Diffstat (limited to 'src')
-rw-r--r--src/unix/realpath.c2
-rw-r--r--src/util.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/unix/realpath.c b/src/unix/realpath.c
index f382c2b73..15601bd22 100644
--- a/src/unix/realpath.c
+++ b/src/unix/realpath.c
@@ -22,7 +22,7 @@ char *p_realpath(const char *pathname, char *resolved)
/* Figure out if the file exists */
if (!access(ret, F_OK))
- ret;
+ return ret;
return NULL;
}
diff --git a/src/util.c b/src/util.c
index 44ac1af73..8e83d298e 100644
--- a/src/util.c
+++ b/src/util.c
@@ -672,7 +672,7 @@ static int GIT_STDLIB_CALL git__qsort_r_glue_cmp(
void git__qsort_r(
void *els, size_t nel, size_t elsize, git__sort_r_cmp cmp, void *payload)
{
-#if defined(__MINGW32__)
+#if defined(__MINGW32__) || defined(__OpenBSD__)
git__insertsort_r(els, nel, elsize, NULL, cmp, payload);
#elif defined(GIT_WIN32)
git__qsort_r_glue glue = { cmp, payload };